summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2018-06-05 14:04:00 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-05 13:51:04 +0000
commit7193a7f1f4f49ba940d5b4cc15a46be2077d0a14 (patch)
treeb564b8d891051b3258566ae5d594d90f07e7f6a2
parent29445f6e37a669276d28b96e07d6f80443f244b8 (diff)
downloadmeta-qt5-7193a7f1f4f49ba940d5b4cc15a46be2077d0a14.tar.gz
qtquick1: remove recipe and all references
* webkit part is broken (at least) * It is dead since 5.7 / 11/2016 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--lib/recipetool/create_qt5.py1
-rwxr-xr-xrecipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb5
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb29
3 files changed, 0 insertions, 35 deletions
diff --git a/lib/recipetool/create_qt5.py b/lib/recipetool/create_qt5.py
index 51708b40..3ac991fb 100644
--- a/lib/recipetool/create_qt5.py
+++ b/lib/recipetool/create_qt5.py
@@ -79,7 +79,6 @@ class Qmake5RecipeHandler(RecipeHandler):
79 'core': 'qtbase', 79 'core': 'qtbase',
80 'gui': 'qtbase', 80 'gui': 'qtbase',
81 'dbus': 'qtbase', 81 'dbus': 'qtbase',
82 'declarative': 'qtquick1',
83 'designer': 'qttools', 82 'designer': 'qttools',
84 'help': 'qttools', 83 'help': 'qttools',
85 'multimedia': 'qtmultimedia', 84 'multimedia': 'qtmultimedia',
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index f8662ecb..8219aeb2 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"
9 9
10# Requires Ruby to work 10# Requires Ruby to work
11USE_RUBY = " \ 11USE_RUBY = " \
12 qtquick1-dev \
13 qtquick1-mkspecs \
14 qtquick1-plugins \
15 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick1-qmlplugins', '', d)} \
16 qttranslations-qtquick1 \
17 qtwebkit-dev \ 12 qtwebkit-dev \
18" 13"
19 14
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
deleted file mode 100644
index fd440b74..00000000
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1require qt5.inc
2require qt5-git.inc
3require qt5-ptest.inc
4
5HOMEPAGE = "http://www.qt.io"
6LICENSE = "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 )"
7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
10 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13"
14
15DEPENDS += "qtscript qtsvg qtxmlpatterns"
16# qttools
17
18PACKAGECONFIG ??= "webkit"
19PACKAGECONFIG[webkit] = ",,qtwebkit"
20
21EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'webkit', '', 'CONFIG+=noqtwebkit', d)}"
22
23do_configure_prepend() {
24 sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro
25}
26
27QT_MODULE_BRANCH = "dev"
28
29SRCREV = "fa02271a18837f20e82006de23c2af1899294aa1"