[oe] [meta-qt5][PATCH] qtquick1: remove recipe and all references

Andreas Müller schnitzeltony at gmail.com
Tue Jun 5 12:04:00 UTC 2018


* webkit part is broken (at least)
* It is dead since 5.7 / 11/2016

Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
---
 lib/recipetool/create_qt5.py                       |  1 -
 .../packagegroup-qt5-toolchain-target.bb           |  5 ----
 recipes-qt/qt5/qtquick1_git.bb                     | 29 ----------------------
 3 files changed, 35 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtquick1_git.bb

diff --git a/lib/recipetool/create_qt5.py b/lib/recipetool/create_qt5.py
index 51708b4..3ac991f 100644
--- a/lib/recipetool/create_qt5.py
+++ b/lib/recipetool/create_qt5.py
@@ -79,7 +79,6 @@ class Qmake5RecipeHandler(RecipeHandler):
               'core': 'qtbase',
               'gui': 'qtbase',
               'dbus': 'qtbase',
-              'declarative': 'qtquick1',
               'designer': 'qttools',
               'help': 'qttools',
               'multimedia': 'qtmultimedia',
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index f8662ec..8219aeb 100755
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -9,11 +9,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 # Requires Ruby to work
 USE_RUBY = " \
-    qtquick1-dev \
-    qtquick1-mkspecs \
-    qtquick1-plugins \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick1-qmlplugins', '', d)} \
-    qttranslations-qtquick1 \
     qtwebkit-dev \
 "
 
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
deleted file mode 100644
index fd440b7..0000000
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-require qt5.inc
-require qt5-git.inc
-require qt5-ptest.inc
-
-HOMEPAGE = "http://www.qt.io"
-LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-DEPENDS += "qtscript qtsvg qtxmlpatterns"
-# qttools
-
-PACKAGECONFIG ??= "webkit"
-PACKAGECONFIG[webkit] = ",,qtwebkit"
-
-EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'webkit', '', 'CONFIG+=noqtwebkit', d)}"
-
-do_configure_prepend() {
-    sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro
-}
-
-QT_MODULE_BRANCH = "dev"
-
-SRCREV = "fa02271a18837f20e82006de23c2af1899294aa1"
-- 
2.14.3




More information about the Openembedded-devel mailing list