diff options
Diffstat (limited to 'recipes-qt/qt5')
76 files changed, 462 insertions, 295 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index 884b1a62..62e841c2 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/recipes-qt/qt5/nativesdk-qtbase.inc | |||
@@ -23,6 +23,8 @@ SRC_URI += "\ | |||
23 | file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ | 23 | file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ |
24 | file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \ | 24 | file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \ |
25 | file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \ | 25 | file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \ |
26 | file://0015-Fix-missing-plugin_types.patch \ | ||
27 | file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ | ||
26 | " | 28 | " |
27 | 29 | ||
28 | # common with -native | 30 | # common with -native |
@@ -67,7 +69,6 @@ FILES_${PN}-tools = " \ | |||
67 | DEBIAN_NOAUTONAME_${PN}-tools = "1" | 69 | DEBIAN_NOAUTONAME_${PN}-tools = "1" |
68 | 70 | ||
69 | QT_CONFIG_FLAGS += " \ | 71 | QT_CONFIG_FLAGS += " \ |
70 | -reduce-relocations \ | ||
71 | -shared \ | 72 | -shared \ |
72 | -silent \ | 73 | -silent \ |
73 | -no-pch \ | 74 | -no-pch \ |
diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb deleted file mode 100644 index c106d227..00000000 --- a/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b" | ||
5 | SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0" | ||
diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb b/recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb new file mode 100644 index 00000000..95d3af72 --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "4bc43a72e1b3d804171e5b52640e8d96" | ||
5 | SRC_URI[sha256sum] = "07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab" | ||
diff --git a/recipes-qt/qt5/nativesdk-qttools.inc b/recipes-qt/qt5/nativesdk-qttools.inc index c67f9cdf..6b8ba54f 100644 --- a/recipes-qt/qt5/nativesdk-qttools.inc +++ b/recipes-qt/qt5/nativesdk-qttools.inc | |||
@@ -9,6 +9,12 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools:" | |||
9 | 9 | ||
10 | SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch" | 10 | SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch" |
11 | 11 | ||
12 | # older copyright year than what e.g. qtbase is using now | ||
13 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
14 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
15 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
16 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
17 | |||
12 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" | 18 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" |
13 | 19 | ||
14 | FILES_${PN}-dbg = " \ | 20 | FILES_${PN}-dbg = " \ |
diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb deleted file mode 100644 index d186a213..00000000 --- a/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b" | ||
5 | SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5" | ||
diff --git a/recipes-qt/qt5/nativesdk-qttools_5.3.0.bb b/recipes-qt/qt5/nativesdk-qttools_5.3.0.bb new file mode 100644 index 00000000..d3956a7e --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qttools_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "628a91ddfe34efc6622fdba8c6348855" | ||
5 | SRC_URI[sha256sum] = "f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250" | ||
diff --git a/recipes-qt/qt5/qt5-5.2.1.inc b/recipes-qt/qt5/qt5-5.3.0.inc index 50e8a7a0..21c1a226 100644 --- a/recipes-qt/qt5/qt5-5.2.1.inc +++ b/recipes-qt/qt5/qt5-5.3.0.inc | |||
@@ -4,7 +4,7 @@ | |||
4 | QT_VERSION ?= "${PV}" | 4 | QT_VERSION ?= "${PV}" |
5 | 5 | ||
6 | # it's different for RC versions | 6 | # it's different for RC versions |
7 | QT_VERSION_DIR ?= "5.2" | 7 | QT_VERSION_DIR ?= "5.3" |
8 | 8 | ||
9 | SRC_URI += " \ | 9 | SRC_URI += " \ |
10 | http://download.qt-project.org/official_releases/qt/${QT_VERSION_DIR}/${QT_VERSION}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ | 10 | http://download.qt-project.org/official_releases/qt/${QT_VERSION_DIR}/${QT_VERSION}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ |
@@ -13,7 +13,7 @@ SRC_URI += " \ | |||
13 | S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" | 13 | S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" |
14 | 14 | ||
15 | LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" | 15 | LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" |
16 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 16 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=2abca611d56c23eb99943bde21c80a0d \ |
17 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | 17 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ |
18 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | 18 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ |
19 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | 19 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" |
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 860bc290..dc049872 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc | |||
@@ -19,6 +19,8 @@ SRC_URI += "\ | |||
19 | file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ | 19 | file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ |
20 | file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \ | 20 | file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \ |
21 | file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \ | 21 | file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \ |
22 | file://0015-Fix-missing-plugin_types.patch \ | ||
23 | file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ | ||
22 | " | 24 | " |
23 | 25 | ||
24 | # specific for native version | 26 | # specific for native version |
diff --git a/recipes-qt/qt5/qtbase-native_5.2.1.bb b/recipes-qt/qt5/qtbase-native_5.3.0.bb index 54adc48f..8468b4fc 100644 --- a/recipes-qt/qt5/qtbase-native_5.2.1.bb +++ b/recipes-qt/qt5/qtbase-native_5.3.0.bb | |||
@@ -7,5 +7,5 @@ do_install_append() { | |||
7 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 7 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
8 | } | 8 | } |
9 | 9 | ||
10 | SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b" | 10 | SRC_URI[md5sum] = "4bc43a72e1b3d804171e5b52640e8d96" |
11 | SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0" | 11 | SRC_URI[sha256sum] = "07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab" |
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 37688711..726576c7 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
@@ -11,6 +11,8 @@ SRC_URI += "\ | |||
11 | file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ | 11 | file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ |
12 | file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \ | 12 | file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \ |
13 | file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \ | 13 | file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \ |
14 | file://0015-Fix-missing-plugin_types.patch \ | ||
15 | file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ | ||
14 | " | 16 | " |
15 | 17 | ||
16 | SRC_URI += "\ | 18 | SRC_URI += "\ |
@@ -18,7 +20,7 @@ SRC_URI += "\ | |||
18 | file://0011-Allow-building-a-separate-qmake-for-the-target.patch \ | 20 | file://0011-Allow-building-a-separate-qmake-for-the-target.patch \ |
19 | file://0013-QOpenGLPaintDevice-sub-area-support.patch \ | 21 | file://0013-QOpenGLPaintDevice-sub-area-support.patch \ |
20 | file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ | 22 | file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ |
21 | file://0016-eglfs-Fix-quad-coordinates.patch \ | 23 | file://0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ |
22 | " | 24 | " |
23 | 25 | ||
24 | DEPENDS += "qtbase-native" | 26 | DEPENDS += "qtbase-native" |
@@ -126,7 +128,6 @@ PACKAGECONFIG[nis] = "-nis,-no-nis" | |||
126 | PACKAGECONFIG[widgets] = "-widgets,-no-widgets" | 128 | PACKAGECONFIG[widgets] = "-widgets,-no-widgets" |
127 | 129 | ||
128 | QT_CONFIG_FLAGS += " \ | 130 | QT_CONFIG_FLAGS += " \ |
129 | -reduce-relocations \ | ||
130 | -shared \ | 131 | -shared \ |
131 | -silent \ | 132 | -silent \ |
132 | -no-pch \ | 133 | -no-pch \ |
diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch index b8768c89..e1135ce6 100644 --- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7999eeb3f2ab1150aa301ec26ae9bf0788d09c9e Mon Sep 17 00:00:00 2001 | 1 | From 4d690dbc278063648434b0f02bdb1b6f4623b285 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 | 3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 |
4 | Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement | 4 | Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement |
@@ -47,10 +47,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | |||
47 | 1 file changed, 13 insertions(+), 7 deletions(-) | 47 | 1 file changed, 13 insertions(+), 7 deletions(-) |
48 | 48 | ||
49 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | 49 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf |
50 | index 11509ee..be9b929 100644 | 50 | index 2134077..a88b8cc 100644 |
51 | --- a/mkspecs/features/qt_module.prf | 51 | --- a/mkspecs/features/qt_module.prf |
52 | +++ b/mkspecs/features/qt_module.prf | 52 | +++ b/mkspecs/features/qt_module.prf |
53 | @@ -135,30 +135,36 @@ load(qt_installs) | 53 | @@ -170,30 +170,36 @@ load(qt_installs) |
54 | rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* | 54 | rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* |
55 | else: \ | 55 | else: \ |
56 | rplbase = $$MODULE_BASE_OUTDIR | 56 | rplbase = $$MODULE_BASE_OUTDIR |
@@ -75,7 +75,7 @@ index 11509ee..be9b929 100644 | |||
75 | +lafile_replace.CONFIG = path | 75 | +lafile_replace.CONFIG = path |
76 | +QMAKE_PRL_INSTALL_REPLACE += lib_replace lafile_replace | 76 | +QMAKE_PRL_INSTALL_REPLACE += lib_replace lafile_replace |
77 | 77 | ||
78 | unix|win32-g++* { | 78 | unix|mingw { |
79 | CONFIG += create_pc | 79 | CONFIG += create_pc |
80 | QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace | 80 | QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace |
81 | - QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace | 81 | - QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace |
@@ -93,7 +93,7 @@ index 11509ee..be9b929 100644 | |||
93 | + QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace lafile_replace | 93 | + QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace lafile_replace |
94 | } | 94 | } |
95 | 95 | ||
96 | unix|win32-g++* { | 96 | unix|mingw { |
97 | -- | 97 | -- |
98 | 1.8.5.3 | 98 | 1.9.3 |
99 | 99 | ||
diff --git a/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch new file mode 100644 index 00000000..2f4d80cd --- /dev/null +++ b/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 959b2fb8d8eb5e755e3d9d3d3031b996f96fb23b Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 | ||
4 | Subject: [PATCH 8/8] qeglplatformintegration: Undefine CursorShape from X.h | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++ | ||
9 | 1 file changed, 6 insertions(+) | ||
10 | |||
11 | diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | ||
12 | index f665455..9eb783c 100644 | ||
13 | --- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | ||
14 | +++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | ||
15 | @@ -46,6 +46,12 @@ | ||
16 | #include <qpa/qplatformnativeinterface.h> | ||
17 | #include <EGL/egl.h> | ||
18 | |||
19 | +// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/ | ||
20 | +// /usr/include/X11/X.h:#define CursorShape 0 /* largest size that can be displayed */ | ||
21 | +#ifdef CursorShape | ||
22 | +#undef CursorShape | ||
23 | +#endif | ||
24 | + | ||
25 | QT_BEGIN_NAMESPACE | ||
26 | |||
27 | class QEGLPlatformScreen; | ||
28 | -- | ||
29 | 2.0.0 | ||
30 | |||
diff --git a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch index 5681b583..c55bc542 100644 --- a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8a10c6d053fe438aec007e4a73b60ac59716ccd4 Mon Sep 17 00:00:00 2001 | 1 | From 745055eb0f56ec4d48ea2ce57bcf3d0011afcec0 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
4 | Subject: [PATCH 10/12] Always build uic | 4 | Subject: [PATCH 10/12] Always build uic |
@@ -10,14 +10,14 @@ Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 | |||
10 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> | 10 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> |
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
12 | --- | 12 | --- |
13 | src/src.pro | 4 ++-- | 13 | src/src.pro | 2 +- |
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/src/src.pro b/src/src.pro | 16 | diff --git a/src/src.pro b/src/src.pro |
17 | index b7887a6..8801544 100644 | 17 | index 6a805a6..90623a6 100644 |
18 | --- a/src/src.pro | 18 | --- a/src/src.pro |
19 | +++ b/src/src.pro | 19 | +++ b/src/src.pro |
20 | @@ -145,7 +145,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent | 20 | @@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent |
21 | } | 21 | } |
22 | } | 22 | } |
23 | } | 23 | } |
@@ -26,13 +26,6 @@ index b7887a6..8801544 100644 | |||
26 | 26 | ||
27 | nacl: SUBDIRS -= src_network src_testlib | 27 | nacl: SUBDIRS -= src_network src_testlib |
28 | 28 | ||
29 | @@ -156,4 +156,4 @@ TR_EXCLUDE = \ | ||
30 | src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml | ||
31 | |||
32 | sub-tools.depends = $$TOOLS | ||
33 | -QMAKE_EXTRA_TARGETS = sub-tools | ||
34 | \ No newline at end of file | ||
35 | +QMAKE_EXTRA_TARGETS = sub-tools | ||
36 | -- | 29 | -- |
37 | 1.8.5.3 | 30 | 1.9.3 |
38 | 31 | ||
diff --git a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch index c6ec67cb..54039de9 100644 --- a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2fad0a6fa3c06577995ac44ed0a2a12eaef819c2 Mon Sep 17 00:00:00 2001 | 1 | From 3c7bfc66e6c84fe06b16dfa0b76ee71701e8d5b5 Mon Sep 17 00:00:00 2001 |
2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> | 2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> |
3 | Date: Thu, 16 May 2013 09:52:07 +0300 | 3 | Date: Thu, 16 May 2013 09:52:07 +0300 |
4 | Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support |
@@ -14,13 +14,13 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | --- | 14 | --- |
15 | src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ | 15 | src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ |
16 | src/gui/opengl/qopenglpaintdevice.h | 2 ++ | 16 | src/gui/opengl/qopenglpaintdevice.h | 2 ++ |
17 | src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++--- | 17 | src/gui/opengl/qopenglpaintengine.cpp | 9 +++++++-- |
18 | src/gui/opengl/qopenglpaintengine_p.h | 1 + | 18 | src/gui/opengl/qopenglpaintengine_p.h | 1 + |
19 | src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- | 19 | src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- |
20 | 5 files changed, 23 insertions(+), 4 deletions(-) | 20 | 5 files changed, 23 insertions(+), 3 deletions(-) |
21 | 21 | ||
22 | diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp | 22 | diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp |
23 | index fa392d1..5df1762 100644 | 23 | index 6750458..034630a 100644 |
24 | --- a/src/gui/opengl/qopenglpaintdevice.cpp | 24 | --- a/src/gui/opengl/qopenglpaintdevice.cpp |
25 | +++ b/src/gui/opengl/qopenglpaintdevice.cpp | 25 | +++ b/src/gui/opengl/qopenglpaintdevice.cpp |
26 | @@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate | 26 | @@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate |
@@ -76,7 +76,7 @@ index c05571c..01eb1bc 100644 | |||
76 | void setSize(const QSize &size); | 76 | void setSize(const QSize &size); |
77 | void setDevicePixelRatio(qreal devicePixelRatio); | 77 | void setDevicePixelRatio(qreal devicePixelRatio); |
78 | diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp | 78 | diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp |
79 | index 0513551..f6aeb15 100644 | 79 | index 81a0d82..ce57261 100644 |
80 | --- a/src/gui/opengl/qopenglpaintengine.cpp | 80 | --- a/src/gui/opengl/qopenglpaintengine.cpp |
81 | +++ b/src/gui/opengl/qopenglpaintengine.cpp | 81 | +++ b/src/gui/opengl/qopenglpaintengine.cpp |
82 | @@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) | 82 | @@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) |
@@ -90,24 +90,24 @@ index 0513551..f6aeb15 100644 | |||
90 | d->width = sz.width(); | 90 | d->width = sz.width(); |
91 | d->height = sz.height(); | 91 | d->height = sz.height(); |
92 | d->mode = BrushDrawingMode; | 92 | d->mode = BrushDrawingMode; |
93 | @@ -2073,7 +2076,7 @@ void QOpenGL2PaintEngineEx::ensureActive() | 93 | @@ -2070,7 +2073,7 @@ void QOpenGL2PaintEngineEx::ensureActive() |
94 | d->device->ensureActiveTarget(); | 94 | d->device->ensureActiveTarget(); |
95 | 95 | ||
96 | d->transferMode(BrushDrawingMode); | 96 | d->transferMode(BrushDrawingMode); |
97 | - glViewport(0, 0, d->width, d->height); | 97 | - d->funcs.glViewport(0, 0, d->width, d->height); |
98 | + glViewport(d->x, d->y, d->width, d->height); | 98 | + d->funcs.glViewport(d->x, d->y, d->width, d->height); |
99 | d->needsSync = false; | 99 | d->needsSync = false; |
100 | d->lastMaskTextureUsed = 0; | 100 | d->lastMaskTextureUsed = 0; |
101 | d->shaderManager->setDirty(); | 101 | d->shaderManager->setDirty(); |
102 | @@ -2116,6 +2119,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | 102 | @@ -2113,6 +2116,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() |
103 | if (bounds == QRect(0, 0, width, height)) { | 103 | if (bounds == QRect(0, 0, width, height)) { |
104 | glDisable(GL_SCISSOR_TEST); | 104 | funcs.glDisable(GL_SCISSOR_TEST); |
105 | } else { | 105 | } else { |
106 | + bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height()); | 106 | + bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height()); |
107 | glEnable(GL_SCISSOR_TEST); | 107 | funcs.glEnable(GL_SCISSOR_TEST); |
108 | setScissor(bounds); | 108 | setScissor(bounds); |
109 | } | 109 | } |
110 | @@ -2124,14 +2128,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | 110 | @@ -2121,12 +2125,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() |
111 | 111 | ||
112 | void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) | 112 | void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) |
113 | { | 113 | { |
@@ -120,12 +120,10 @@ index 0513551..f6aeb15 100644 | |||
120 | } | 120 | } |
121 | + bottom += y; | 121 | + bottom += y; |
122 | const int height = rect.height(); | 122 | const int height = rect.height(); |
123 | - | ||
124 | glScissor(left, bottom, width, height); | ||
125 | } | ||
126 | 123 | ||
124 | funcs.glScissor(left, bottom, width, height); | ||
127 | diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h | 125 | diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h |
128 | index d51f0e5..0d4b38d 100644 | 126 | index 4f0e2e5..f211de1 100644 |
129 | --- a/src/gui/opengl/qopenglpaintengine_p.h | 127 | --- a/src/gui/opengl/qopenglpaintengine_p.h |
130 | +++ b/src/gui/opengl/qopenglpaintengine_p.h | 128 | +++ b/src/gui/opengl/qopenglpaintengine_p.h |
131 | @@ -264,6 +264,7 @@ public: | 129 | @@ -264,6 +264,7 @@ public: |
@@ -137,18 +135,18 @@ index d51f0e5..0d4b38d 100644 | |||
137 | QOpenGLContext *ctx; | 135 | QOpenGLContext *ctx; |
138 | EngineMode mode; | 136 | EngineMode mode; |
139 | diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp | 137 | diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp |
140 | index 3b62d1d..a5d1f7e 100644 | 138 | index ac88d9d..6c77f10 100644 |
141 | --- a/src/gui/opengl/qopengltextureglyphcache.cpp | 139 | --- a/src/gui/opengl/qopengltextureglyphcache.cpp |
142 | +++ b/src/gui/opengl/qopengltextureglyphcache.cpp | 140 | +++ b/src/gui/opengl/qopengltextureglyphcache.cpp |
143 | @@ -273,7 +273,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) | 141 | @@ -315,7 +315,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) |
144 | funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); | 142 | funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); |
145 | 143 | ||
146 | if (pex != 0) { | 144 | if (pex != 0) { |
147 | - glViewport(0, 0, pex->width, pex->height); | 145 | - funcs->glViewport(0, 0, pex->width, pex->height); |
148 | + glViewport(pex->x, pex->y, pex->width, pex->height); | 146 | + funcs->glViewport(pex->x, pex->y, pex->width, pex->height); |
149 | pex->updateClipScissorTest(); | 147 | pex->updateClipScissorTest(); |
150 | } else { | 148 | } else { |
151 | m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); | 149 | if (m_vao.isCreated()) { |
152 | -- | 150 | -- |
153 | 1.8.5.3 | 151 | 1.9.3 |
154 | 152 | ||
diff --git a/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch b/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch deleted file mode 100644 index a31301e3..00000000 --- a/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 99979159a404df09495c8ddd6a052837f66b8739 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net> | ||
3 | Date: Fri, 7 Feb 2014 13:12:37 +0100 | ||
4 | Subject: [PATCH] Fix linuxfb argument 'mmsize' parsing | ||
5 | |||
6 | Parse first for 'mmsize' because the regex for 'size' also fits to 'mmsize'. | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | Task-number: QTBUG-29133 | ||
11 | Change-Id: Idc4950270818e496d5d94a97a172b7c780f069b1 | ||
12 | Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> | ||
13 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
14 | --- | ||
15 | src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | 4 ++-- | ||
16 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | ||
19 | index 735a43d..33a9523 100644 | ||
20 | --- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | ||
21 | +++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | ||
22 | @@ -333,6 +333,8 @@ bool QLinuxFbScreen::initialize() | ||
23 | foreach (const QString &arg, mArgs) { | ||
24 | if (arg == QLatin1String("nographicsmodeswitch")) | ||
25 | doSwitchToGraphicsMode = false; | ||
26 | + else if (mmSizeRx.indexIn(arg) != -1) | ||
27 | + userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt()); | ||
28 | else if (sizeRx.indexIn(arg) != -1) | ||
29 | userGeometry.setSize(QSize(sizeRx.cap(1).toInt(), sizeRx.cap(2).toInt())); | ||
30 | else if (offsetRx.indexIn(arg) != -1) | ||
31 | @@ -341,8 +343,6 @@ bool QLinuxFbScreen::initialize() | ||
32 | ttyDevice = ttyRx.cap(1); | ||
33 | else if (fbRx.indexIn(arg) != -1) | ||
34 | fbDevice = fbRx.cap(1); | ||
35 | - else if (mmSizeRx.indexIn(arg) != -1) | ||
36 | - userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt()); | ||
37 | } | ||
38 | |||
39 | if (fbDevice.isEmpty()) { | ||
40 | -- | ||
41 | 1.7.1 | ||
42 | |||
diff --git a/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch new file mode 100644 index 00000000..612cbdda --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From f0e01b788e86f24352ba14ad17c3f337f934467d Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 21 Apr 2014 15:09:23 +0200 | ||
4 | Subject: [PATCH] Fix missing plugin_types | ||
5 | |||
6 | * bearer/generic was failing with: | ||
7 | Project ERROR: No module claims plugin type 'bearer' | ||
8 | |||
9 | Change-Id: I90848856a8b0a4df52e599983cf7dde0bc0e6623 | ||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | mkspecs/features/qt_module_pris.prf | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf | ||
16 | index f31bc38..415e780 100644 | ||
17 | --- a/mkspecs/features/qt_module_pris.prf | ||
18 | +++ b/mkspecs/features/qt_module_pris.prf | ||
19 | @@ -177,7 +177,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri | ||
20 | include($$mod_work_pfx/qt_lib_$${pri}.pri) | ||
21 | for(mod, mods_to_load) { | ||
22 | for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \ | ||
23 | - name depends module_config CONFIG DEFINES sources \ | ||
24 | + name depends module_config plugin_types CONFIG DEFINES sources \ | ||
25 | includes bins libs libexecs plugins imports qml \ | ||
26 | rpath_link \ | ||
27 | )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient) | ||
28 | -- | ||
29 | 1.9.1 | ||
30 | |||
diff --git a/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch new file mode 100644 index 00000000..65ebbd1c --- /dev/null +++ b/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 91b185d1f4843d22d42461c0aee4cd0f5393bbc8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 21 Apr 2014 19:22:04 +0200 | ||
4 | Subject: [PATCH] Revert "eglfs: Print the chosen config in debug mode" | ||
5 | |||
6 | This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. | ||
7 | --- | ||
8 | src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++- | ||
9 | src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 ------- | ||
10 | 2 files changed, 3 insertions(+), 8 deletions(-) | ||
11 | |||
12 | diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp | ||
13 | index e6624fb..3870f6c 100644 | ||
14 | --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp | ||
15 | +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp | ||
16 | @@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) | ||
17 | for (index = 0; attrs[index].attr != -1; ++index) { | ||
18 | EGLint value; | ||
19 | if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) { | ||
20 | - qDebug("\t%s: %d", attrs[index].name, (int)value); | ||
21 | + qWarning("\t%s: %d\n", attrs[index].name, (int)value); | ||
22 | } | ||
23 | } | ||
24 | + | ||
25 | + qWarning("\n"); | ||
26 | } | ||
27 | |||
28 | #ifdef Q_OS_LINUX | ||
29 | diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | ||
30 | index eec6463..4a7c69b 100644 | ||
31 | --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | ||
32 | +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | ||
33 | @@ -44,7 +44,6 @@ | ||
34 | #include "qeglpbuffer_p.h" | ||
35 | #include <qpa/qplatformwindow.h> | ||
36 | #include <QOpenGLContext> | ||
37 | -#include <QDebug> | ||
38 | |||
39 | QT_BEGIN_NAMESPACE | ||
40 | |||
41 | @@ -192,12 +191,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont | ||
42 | return; | ||
43 | } | ||
44 | |||
45 | - static const bool printConfig = qgetenv("QT_QPA_EGLFS_DEBUG").toInt(); | ||
46 | - if (printConfig) { | ||
47 | - qDebug() << "Created context for format" << format << "with config:"; | ||
48 | - q_printEglConfig(m_eglDisplay, m_eglConfig); | ||
49 | - } | ||
50 | - | ||
51 | #ifndef QT_NO_OPENGL | ||
52 | // Make the context current to ensure the GL version query works. This needs a surface too. | ||
53 | const EGLint pbufferAttributes[] = { | ||
54 | -- | ||
55 | 1.9.1 | ||
56 | |||
diff --git a/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch b/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch deleted file mode 100644 index 92785e45..00000000 --- a/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 84756d94c73885803ad8044099ab47c0c49b5076 Mon Sep 17 00:00:00 2001 | ||
2 | From: Laszlo Agocs <laszlo.agocs@digia.com> | ||
3 | Date: Thu, 23 Jan 2014 11:45:22 +0100 | ||
4 | Subject: [PATCH] eglfs: Fix quad coordinates | ||
5 | |||
6 | Prevent artifacts on raster windows by properly mapping | ||
7 | the coordinates to [-1,1]. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Task-number: QTBUG-36370 | ||
12 | Change-Id: I95d0d03952f597ef4ce6a950c6533a3af2df964a | ||
13 | Reviewed-by: Andy Nichols <andy.nichols@digia.com> | ||
14 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
15 | --- | ||
16 | src/plugins/platforms/eglfs/qeglfscompositor.cpp | 5 +++-- | ||
17 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/src/plugins/platforms/eglfs/qeglfscompositor.cpp b/src/plugins/platforms/eglfs/qeglfscompositor.cpp | ||
20 | index 845bb5b..1efc4f7 100644 | ||
21 | --- a/src/plugins/platforms/eglfs/qeglfscompositor.cpp | ||
22 | +++ b/src/plugins/platforms/eglfs/qeglfscompositor.cpp | ||
23 | @@ -153,10 +153,11 @@ void QEglFSCompositor::render(QEglFSWindow *window, uint texture, bool raster) | ||
24 | QPoint tl = r.topLeft(); | ||
25 | QPoint br = r.bottomRight(); | ||
26 | |||
27 | + // Map to [-1,1] | ||
28 | GLfloat x1 = (tl.x() / sr.width()) * 2 - 1; | ||
29 | - GLfloat x2 = (br.x() / sr.width()) * 2 - 1; | ||
30 | GLfloat y1 = ((sr.height() - tl.y()) / sr.height()) * 2 - 1; | ||
31 | - GLfloat y2 = ((sr.height() - br.y()) / sr.height()) * 2 - 1; | ||
32 | + GLfloat x2 = ((br.x() + 1) / sr.width()) * 2 - 1; | ||
33 | + GLfloat y2 = ((sr.height() - (br.y() + 1)) / sr.height()) * 2 - 1; | ||
34 | |||
35 | if (!raster) | ||
36 | qSwap(y1, y2); | ||
37 | -- | ||
38 | 1.7.1 | ||
39 | |||
diff --git a/recipes-qt/qt5/qtbase_5.2.1.bb b/recipes-qt/qt5/qtbase_5.2.1.bb deleted file mode 100644 index 4257367a..00000000 --- a/recipes-qt/qt5/qtbase_5.2.1.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI += "file://0015-Fix-linuxfb-argument-mmsize-parsing.patch" | ||
5 | |||
6 | SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b" | ||
7 | SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0" | ||
diff --git a/recipes-qt/qt5/qtbase_5.3.0.bb b/recipes-qt/qt5/qtbase_5.3.0.bb new file mode 100644 index 00000000..95d3af72 --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "4bc43a72e1b3d804171e5b52640e8d96" | ||
5 | SRC_URI[sha256sum] = "07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab" | ||
diff --git a/recipes-qt/qt5/qtconnectivity.inc b/recipes-qt/qt5/qtconnectivity.inc index c0a51470..a5fbb0c1 100644 --- a/recipes-qt/qt5/qtconnectivity.inc +++ b/recipes-qt/qt5/qtconnectivity.inc | |||
@@ -11,3 +11,9 @@ do_configure_prepend() { | |||
11 | } | 11 | } |
12 | 12 | ||
13 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'bluez4', 'CONFIG+=OE_BLUEZ_ENABLED', '', d)}" | 13 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'bluez4', 'CONFIG+=OE_BLUEZ_ENABLED', '', d)}" |
14 | |||
15 | # older copyright year than what e.g. qtbase is using now | ||
16 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
17 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
18 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
19 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtconnectivity_5.2.1.bb b/recipes-qt/qt5/qtconnectivity_5.2.1.bb deleted file mode 100644 index 6fd0c7ba..00000000 --- a/recipes-qt/qt5/qtconnectivity_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "cb2ef624b28b6ba61d6a467b8b3c314a" | ||
5 | SRC_URI[sha256sum] = "ec31e1c3cd5aea4d7dff946802a7fde2599bb8a1931d4bb49cb0854371cf1223" | ||
diff --git a/recipes-qt/qt5/qtconnectivity_5.3.0.bb b/recipes-qt/qt5/qtconnectivity_5.3.0.bb new file mode 100644 index 00000000..2fb3f091 --- /dev/null +++ b/recipes-qt/qt5/qtconnectivity_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "46e4e8df94b4da4415aa5f5076b8bc45" | ||
5 | SRC_URI[sha256sum] = "d83555be4fc805afe9ef307cf8633d9c0cebc678042e384b24e0aa61d7bc1d02" | ||
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 4a186fdc..bdb1de9d 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc | |||
@@ -2,8 +2,15 @@ require qt5.inc | |||
2 | 2 | ||
3 | SRC_URI += " \ | 3 | SRC_URI += " \ |
4 | file://0001-qmltestexample-fix-link.patch \ | 4 | file://0001-qmltestexample-fix-link.patch \ |
5 | file://0002-Fix-improper-antialiasing-property-behavior.patch \ | ||
5 | " | 6 | " |
6 | 7 | ||
8 | # older copyright year than what e.g. qtbase is using now | ||
9 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
10 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
11 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
13 | |||
7 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
8 | 15 | ||
9 | PACKAGECONFIG ??= "qtxmlpatterns" | 16 | PACKAGECONFIG ??= "qtxmlpatterns" |
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch b/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch new file mode 100644 index 00000000..821149f2 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 009ad875f89d7d7bc4447e18c2fbbd485a75e0b5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Oleg Shparber <trollixx@gmail.com> | ||
3 | Date: Mon, 19 May 2014 00:53:39 -0700 | ||
4 | Subject: [PATCH] Fix improper antialiasing property behavior | ||
5 | |||
6 | For components antialiased by default the property was returned | ||
7 | as false if default true value was set to true again. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Task-number: QTBUG-39047 | ||
12 | Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4 | ||
13 | Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> | ||
14 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
15 | --- | ||
16 | src/quick/items/qquickitem.cpp | 8 +++++--- | ||
17 | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 7 +++++++ | ||
18 | 2 files changed, 12 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp | ||
21 | index 3f0dae8..ef2eac4 100644 | ||
22 | --- a/src/quick/items/qquickitem.cpp | ||
23 | +++ b/src/quick/items/qquickitem.cpp | ||
24 | @@ -5691,10 +5691,12 @@ void QQuickItem::setAntialiasing(bool aa) | ||
25 | { | ||
26 | Q_D(QQuickItem); | ||
27 | |||
28 | - bool changed = (aa != antialiasing()); | ||
29 | - d->antialiasingValid = true; | ||
30 | + if (!d->antialiasingValid) { | ||
31 | + d->antialiasingValid = true; | ||
32 | + d->antialiasing = d->implicitAntialiasing; | ||
33 | + } | ||
34 | |||
35 | - if (!changed) | ||
36 | + if (aa == d->antialiasing) | ||
37 | return; | ||
38 | |||
39 | d->antialiasing = aa; | ||
40 | diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp | ||
41 | index 0b69981..d36c55d 100644 | ||
42 | --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp | ||
43 | +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp | ||
44 | @@ -1334,6 +1334,13 @@ void tst_qquicktext::antialiasing() | ||
45 | text->resetAntialiasing(); | ||
46 | QCOMPARE(text->antialiasing(), true); | ||
47 | QCOMPARE(spy.count(), 2); | ||
48 | + | ||
49 | + // QTBUG-39047 | ||
50 | + component.setData("import QtQuick 2.0\n Text { antialiasing: true }", QUrl()); | ||
51 | + object.reset(component.create()); | ||
52 | + text = qobject_cast<QQuickText *>(object.data()); | ||
53 | + QVERIFY(text); | ||
54 | + QCOMPARE(text->antialiasing(), true); | ||
55 | } | ||
56 | |||
57 | void tst_qquicktext::weight() | ||
58 | -- | ||
59 | 1.9.3 | ||
60 | |||
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch deleted file mode 100644 index 5643634c..00000000 --- a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From a13535b21b8406d65c8f139306d8324bda05443b Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> | ||
3 | Date: Wed, 5 Jun 2013 19:23:32 +0200 | ||
4 | Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions | ||
5 | |||
6 | Viewport is calculated wrong for horizontal layout in a second instance | ||
7 | |||
8 | Task-number: QTBUG-29944 | ||
9 | Task-Number: QTBUG-31546 | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Looks like backport of https://codereview.qt-project.org/49226 but this | ||
14 | one was applied in previous patch, this change looks the same but is | ||
15 | in different part of qquickitemview.cpp and ISN'T applied yet in dev | ||
16 | branch. | ||
17 | |||
18 | Signed-off-by: Florian Haenel <florian.haenel@lge.com> | ||
19 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
20 | |||
21 | Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe | ||
22 | --- | ||
23 | src/quick/items/qquickitemview.cpp | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp | ||
27 | index d7b9847..a54d282 100644 | ||
28 | --- a/src/quick/items/qquickitemview.cpp | ||
29 | +++ b/src/quick/items/qquickitemview.cpp | ||
30 | @@ -1835,7 +1835,7 @@ void QQuickItemViewPrivate::layout() | ||
31 | |||
32 | prepareVisibleItemTransitions(); | ||
33 | |||
34 | - QRectF viewBounds(0, position(), q->width(), q->height()); | ||
35 | + QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); | ||
36 | for (QList<FxViewItem*>::Iterator it = releasePendingTransition.begin(); | ||
37 | it != releasePendingTransition.end(); ) { | ||
38 | FxViewItem *item = *it; | ||
39 | -- | ||
40 | 1.8.5.3 | ||
41 | |||
diff --git a/recipes-qt/qt5/qtdeclarative_5.2.1.bb b/recipes-qt/qt5/qtdeclarative_5.2.1.bb deleted file mode 100644 index eaa90bac..00000000 --- a/recipes-qt/qt5/qtdeclarative_5.2.1.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI += " \ | ||
5 | file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ | ||
6 | " | ||
7 | |||
8 | SRC_URI[md5sum] = "a23fba03a4b48f36fe8b51d326d08acc" | ||
9 | SRC_URI[sha256sum] = "7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690" | ||
diff --git a/recipes-qt/qt5/qtdeclarative_5.3.0.bb b/recipes-qt/qt5/qtdeclarative_5.3.0.bb new file mode 100644 index 00000000..6725b576 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "9e29d2b481c771ce5c798a3319835673" | ||
5 | SRC_URI[sha256sum] = "fab07eb4f4b2091e1d88b27b84ac49d7e8daaa1eb72fd62e602ee9ac3ed7f42f" | ||
diff --git a/recipes-qt/qt5/qtgraphicaleffects.inc b/recipes-qt/qt5/qtgraphicaleffects.inc index 2ced3c21..8610c346 100644 --- a/recipes-qt/qt5/qtgraphicaleffects.inc +++ b/recipes-qt/qt5/qtgraphicaleffects.inc | |||
@@ -3,3 +3,9 @@ require qt5.inc | |||
3 | DEPENDS += "qtdeclarative" | 3 | DEPENDS += "qtdeclarative" |
4 | 4 | ||
5 | RDEPENDS_${PN}-dev = "" | 5 | RDEPENDS_${PN}-dev = "" |
6 | |||
7 | # older copyright year than what e.g. qtbase is using now | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
9 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
10 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb deleted file mode 100644 index 4d5673b9..00000000 --- a/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "8dde8593750e33a79f49c5a2f03caf0c" | ||
5 | SRC_URI[sha256sum] = "5abb17ee60d68cf49c4f8f0b69c3f1e4d0a2f7b32cda8d6901d9c35447cc3482" | ||
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb new file mode 100644 index 00000000..f63e05a8 --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "a4170d057978794c2c3c477e841a0e08" | ||
5 | SRC_URI[sha256sum] = "3f95fb603fb3c7fbb54587b3dfe423491e058fd61af2d7371b1f12881cff20c1" | ||
diff --git a/recipes-qt/qt5/qtimageformats.inc b/recipes-qt/qt5/qtimageformats.inc index f90e58aa..b5edf1ba 100644 --- a/recipes-qt/qt5/qtimageformats.inc +++ b/recipes-qt/qt5/qtimageformats.inc | |||
@@ -2,3 +2,9 @@ require qt5.inc | |||
2 | 2 | ||
3 | DEPENDS += "qtbase tiff" | 3 | DEPENDS += "qtbase tiff" |
4 | ALLOW_EMPTY_${PN} = "1" | 4 | ALLOW_EMPTY_${PN} = "1" |
5 | |||
6 | # older copyright year than what e.g. qtbase is using now | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
8 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
9 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtimageformats_5.2.1.bb b/recipes-qt/qt5/qtimageformats_5.2.1.bb deleted file mode 100644 index 2d24ce75..00000000 --- a/recipes-qt/qt5/qtimageformats_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "9b88aa6f3888c7c7f5253c147ae4bf8f" | ||
5 | SRC_URI[sha256sum] = "a6a0454769566fec1757fb09b1f33c9fc70d4016acbb04ebc6e493ddedfef124" | ||
diff --git a/recipes-qt/qt5/qtimageformats_5.3.0.bb b/recipes-qt/qt5/qtimageformats_5.3.0.bb new file mode 100644 index 00000000..509d8150 --- /dev/null +++ b/recipes-qt/qt5/qtimageformats_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "90c751ffe23c005eb411d1f081bf116d" | ||
5 | SRC_URI[sha256sum] = "f3b895847d27eaa98979ad146e6c0f46f38e23471a87ef496b8b777c578db2dc" | ||
diff --git a/recipes-qt/qt5/qtlocation.inc b/recipes-qt/qt5/qtlocation.inc index 41f2d199..a35b0fad 100644 --- a/recipes-qt/qt5/qtlocation.inc +++ b/recipes-qt/qt5/qtlocation.inc | |||
@@ -18,3 +18,9 @@ do_configure_prepend() { | |||
18 | 18 | ||
19 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" | 19 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" |
20 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" | 20 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" |
21 | |||
22 | # older copyright year than what e.g. qtbase is using now | ||
23 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
24 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
25 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
26 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtlocation_5.2.1.bb b/recipes-qt/qt5/qtlocation_5.2.1.bb deleted file mode 100644 index f920e2c7..00000000 --- a/recipes-qt/qt5/qtlocation_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "4de8ca8ac1a3e5db20a903286fb78840" | ||
5 | SRC_URI[sha256sum] = "9543fcdcab5cf02be60e395e8145e1ec87d03a3d1f129a0dde92102283a9b536" | ||
diff --git a/recipes-qt/qt5/qtlocation_5.3.0.bb b/recipes-qt/qt5/qtlocation_5.3.0.bb new file mode 100644 index 00000000..4af556fe --- /dev/null +++ b/recipes-qt/qt5/qtlocation_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "bfc7678bfe7d78f12fb20a54ac54e610" | ||
5 | SRC_URI[sha256sum] = "ca34224a8aa5e6f81c04cbeb05ecc440b82cf27ac24f7c2b1d297a3497110414" | ||
diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index 3b7e5682..119d61ac 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc | |||
@@ -15,3 +15,9 @@ do_configure_prepend() { | |||
15 | 15 | ||
16 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" | 16 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}" |
17 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" | 17 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}" |
18 | |||
19 | # older copyright year than what e.g. qtbase is using now | ||
20 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
21 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
22 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
23 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtmultimedia_5.2.1.bb b/recipes-qt/qt5/qtmultimedia_5.2.1.bb deleted file mode 100644 index fc823a6d..00000000 --- a/recipes-qt/qt5/qtmultimedia_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "26dc22c59fbbad9fdf0699d5f887166a" | ||
5 | SRC_URI[sha256sum] = "62688cb7d8daa4d7050353fe39536c5edd97228a10185b9662a29b8c8cff1fa2" | ||
diff --git a/recipes-qt/qt5/qtmultimedia_5.3.0.bb b/recipes-qt/qt5/qtmultimedia_5.3.0.bb new file mode 100644 index 00000000..4d72587b --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "921f4596ca39b78851663369db0bbcee" | ||
5 | SRC_URI[sha256sum] = "9f30b9f0f758c44db4743d2de409cfa0aef297bc6b81c929b1875dfb638d517b" | ||
diff --git a/recipes-qt/qt5/qtquick1.inc b/recipes-qt/qt5/qtquick1.inc index a9ec211c..0c690b25 100644 --- a/recipes-qt/qt5/qtquick1.inc +++ b/recipes-qt/qt5/qtquick1.inc | |||
@@ -2,3 +2,9 @@ require qt5.inc | |||
2 | 2 | ||
3 | DEPENDS += "qtscript qtsvg qtxmlpatterns qtwebkit" | 3 | DEPENDS += "qtscript qtsvg qtxmlpatterns qtwebkit" |
4 | # qttools | 4 | # qttools |
5 | |||
6 | # older copyright year than what e.g. qtbase is using now | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
8 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
9 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtquick1_5.2.1.bb b/recipes-qt/qt5/qtquick1_5.2.1.bb deleted file mode 100644 index 7563bc6b..00000000 --- a/recipes-qt/qt5/qtquick1_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "6abbf131adffdf3cba63704d5d35f921" | ||
5 | SRC_URI[sha256sum] = "8b2bb3250b9e09a4c568069bc4c7cfeddbdcda50b24f0bfecc7f85df3120ff65" | ||
diff --git a/recipes-qt/qt5/qtquick1_5.3.0.bb b/recipes-qt/qt5/qtquick1_5.3.0.bb new file mode 100644 index 00000000..bf6e8df5 --- /dev/null +++ b/recipes-qt/qt5/qtquick1_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "cd6ffd4a29f7050f71670e7afec09e5d" | ||
5 | SRC_URI[sha256sum] = "74b03938df58e7825b0e46efb8266ac8d53741fff1c467b5b1fbfe2f3b840b68" | ||
diff --git a/recipes-qt/qt5/qtquickcontrols.inc b/recipes-qt/qt5/qtquickcontrols.inc index 2ced3c21..8610c346 100644 --- a/recipes-qt/qt5/qtquickcontrols.inc +++ b/recipes-qt/qt5/qtquickcontrols.inc | |||
@@ -3,3 +3,9 @@ require qt5.inc | |||
3 | DEPENDS += "qtdeclarative" | 3 | DEPENDS += "qtdeclarative" |
4 | 4 | ||
5 | RDEPENDS_${PN}-dev = "" | 5 | RDEPENDS_${PN}-dev = "" |
6 | |||
7 | # older copyright year than what e.g. qtbase is using now | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
9 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
10 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
11 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtquickcontrols_5.2.1.bb b/recipes-qt/qt5/qtquickcontrols_5.2.1.bb deleted file mode 100644 index 2c09e440..00000000 --- a/recipes-qt/qt5/qtquickcontrols_5.2.1.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "027bc7d05fe740b21284dc909c9f11ac" | ||
5 | SRC_URI[sha256sum] = "eb03a69402576984d588923e994c3cb672d8479ac9b68ed90da15d0c2fd82aac" | ||
6 | |||
diff --git a/recipes-qt/qt5/qtquickcontrols_5.3.0.bb b/recipes-qt/qt5/qtquickcontrols_5.3.0.bb new file mode 100644 index 00000000..365d511b --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "808b5a28f152f1af19dad30a10e5dbf1" | ||
5 | SRC_URI[sha256sum] = "b8df0d64b69e765971fd6c71d8f0c4f7aabec73343a98225a4655a0b8b82df1c" | ||
diff --git a/recipes-qt/qt5/qtscript.inc b/recipes-qt/qt5/qtscript.inc index bbb05a65..73f58984 100644 --- a/recipes-qt/qt5/qtscript.inc +++ b/recipes-qt/qt5/qtscript.inc | |||
@@ -1,3 +1,9 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | 2 | ||
3 | DEPENDS += "qtbase" | 3 | DEPENDS += "qtbase" |
4 | |||
5 | # older copyright year than what e.g. qtbase is using now | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
7 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
8 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
9 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtscript_5.2.1.bb b/recipes-qt/qt5/qtscript_5.2.1.bb deleted file mode 100644 index 4617c09e..00000000 --- a/recipes-qt/qt5/qtscript_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "b8af09bb297d4c62e64df5418fe99dc9" | ||
5 | SRC_URI[sha256sum] = "6621350d5eff65cb6f9853247246f30a2d4cdb465c14923ff7ccbd8c3a9cdefa" | ||
diff --git a/recipes-qt/qt5/qtscript_5.3.0.bb b/recipes-qt/qt5/qtscript_5.3.0.bb new file mode 100644 index 00000000..6065e6b1 --- /dev/null +++ b/recipes-qt/qt5/qtscript_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "4f755c8810946246adcfbaa74fafae62" | ||
5 | SRC_URI[sha256sum] = "a86067103ffb4c307619aeaef68fbe25e7219ffd34b369e445cdd4deb4108390" | ||
diff --git a/recipes-qt/qt5/qtsensors.inc b/recipes-qt/qt5/qtsensors.inc index b2147f16..550398e4 100644 --- a/recipes-qt/qt5/qtsensors.inc +++ b/recipes-qt/qt5/qtsensors.inc | |||
@@ -1,3 +1,9 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | 2 | ||
3 | DEPENDS += "qtbase qtdeclarative" | 3 | DEPENDS += "qtbase qtdeclarative" |
4 | |||
5 | # older copyright year than what e.g. qtbase is using now | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
7 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
8 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
9 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtsensors_5.2.1.bb b/recipes-qt/qt5/qtsensors_5.2.1.bb deleted file mode 100644 index 1f340d0d..00000000 --- a/recipes-qt/qt5/qtsensors_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "045f98acba9fba0358a6a50356be0841" | ||
5 | SRC_URI[sha256sum] = "09403e7e088f30da828e452559a6904d7c43420d423a429d6529285f99b1e407" | ||
diff --git a/recipes-qt/qt5/qtsensors_5.3.0.bb b/recipes-qt/qt5/qtsensors_5.3.0.bb new file mode 100644 index 00000000..03df1fcb --- /dev/null +++ b/recipes-qt/qt5/qtsensors_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "3f8c7e7ed87785d8c1fbab4fec6f458d" | ||
5 | SRC_URI[sha256sum] = "dde4d55635e616406adaf8e100dc468ccdd296c6589eff1208f0dce0ffc597c1" | ||
diff --git a/recipes-qt/qt5/qtserialport_5.2.1.bb b/recipes-qt/qt5/qtserialport_5.2.1.bb deleted file mode 100644 index 806e7eee..00000000 --- a/recipes-qt/qt5/qtserialport_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "2993ad7e92a0b6b41e3cb0e0e345d251" | ||
5 | SRC_URI[sha256sum] = "f5754e4ba61843b7dfdf946a91b7d857a5cb470608b840f92452e72f24c67347" | ||
diff --git a/recipes-qt/qt5/qtserialport_5.3.0.bb b/recipes-qt/qt5/qtserialport_5.3.0.bb new file mode 100644 index 00000000..0df68e40 --- /dev/null +++ b/recipes-qt/qt5/qtserialport_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "393a352f82f1f0000157834751a29578" | ||
5 | SRC_URI[sha256sum] = "772d230019c52452dc661e864debf1fd520460bddce8d8abda70a4dcc00e8d5f" | ||
diff --git a/recipes-qt/qt5/qtsvg.inc b/recipes-qt/qt5/qtsvg.inc index bbb05a65..73f58984 100644 --- a/recipes-qt/qt5/qtsvg.inc +++ b/recipes-qt/qt5/qtsvg.inc | |||
@@ -1,3 +1,9 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | 2 | ||
3 | DEPENDS += "qtbase" | 3 | DEPENDS += "qtbase" |
4 | |||
5 | # older copyright year than what e.g. qtbase is using now | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
7 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
8 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
9 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtsvg_5.2.1.bb b/recipes-qt/qt5/qtsvg_5.2.1.bb deleted file mode 100644 index d12bd838..00000000 --- a/recipes-qt/qt5/qtsvg_5.2.1.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "3f5487fe2bd5024f18f63a8d0eb4294d" | ||
5 | SRC_URI[sha256sum] = "788f69557ff6d28073d6ef2b3300b42b987fba1d122f7884ba0269023cab44ef" | ||
6 | |||
diff --git a/recipes-qt/qt5/qtsvg_5.3.0.bb b/recipes-qt/qt5/qtsvg_5.3.0.bb new file mode 100644 index 00000000..77b591b4 --- /dev/null +++ b/recipes-qt/qt5/qtsvg_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "a35e2df8ff2d6b99e4b33443165359f4" | ||
5 | SRC_URI[sha256sum] = "8006ca1cb13844772ac2926e662ab7a0eb16cb26157954cd415e0f6d641b4ed0" | ||
diff --git a/recipes-qt/qt5/qttools-native.inc b/recipes-qt/qt5/qttools-native.inc index 03b88cd1..28fa3f83 100644 --- a/recipes-qt/qt5/qttools-native.inc +++ b/recipes-qt/qt5/qttools-native.inc | |||
@@ -13,3 +13,9 @@ do_configure() { | |||
13 | do_install() { | 13 | do_install() { |
14 | oe_runmake install INSTALL_ROOT=${D} | 14 | oe_runmake install INSTALL_ROOT=${D} |
15 | } | 15 | } |
16 | |||
17 | # older copyright year than what e.g. qtbase is using now | ||
18 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
19 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
20 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
21 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qttools-native_5.2.1.bb b/recipes-qt/qt5/qttools-native_5.2.1.bb deleted file mode 100644 index d186a213..00000000 --- a/recipes-qt/qt5/qttools-native_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b" | ||
5 | SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5" | ||
diff --git a/recipes-qt/qt5/qttools-native_5.3.0.bb b/recipes-qt/qt5/qttools-native_5.3.0.bb new file mode 100644 index 00000000..d3956a7e --- /dev/null +++ b/recipes-qt/qt5/qttools-native_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "628a91ddfe34efc6622fdba8c6348855" | ||
5 | SRC_URI[sha256sum] = "f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250" | ||
diff --git a/recipes-qt/qt5/qttools.inc b/recipes-qt/qt5/qttools.inc index 0192f228..d4d8017f 100644 --- a/recipes-qt/qt5/qttools.inc +++ b/recipes-qt/qt5/qttools.inc | |||
@@ -6,4 +6,10 @@ SRC_URI += " \ | |||
6 | file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \ | 6 | file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \ |
7 | " | 7 | " |
8 | 8 | ||
9 | # older copyright year than what e.g. qtbase is using now | ||
10 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
11 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
12 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
14 | |||
9 | FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples" | 15 | FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples" |
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index 49f296d8..0479bec9 100644 --- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a5150c9701d5b2e6c77e521544034ea732d2266b Mon Sep 17 00:00:00 2001 | 1 | From 5eb3dd427bca8bbc13b7554e8e21993b2fc708e7 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.jansa@gmail.com> | 2 | From: Martin Jansa <Martin.jansa@gmail.com> |
3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 | 3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 |
4 | Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert | 4 | Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert |
@@ -14,9 +14,9 @@ Signed-off-by: Martin Jansa <Martin.jansa@gmail.com> | |||
14 | examples/examples.pro | 4 ++-- | 14 | examples/examples.pro | 4 ++-- |
15 | src/designer/src/src.pro | 16 +++++++++------- | 15 | src/designer/src/src.pro | 16 +++++++++------- |
16 | src/linguist/linguist.pro | 2 +- | 16 | src/linguist/linguist.pro | 2 +- |
17 | src/src.pro | 10 ++++++---- | 17 | src/src.pro | 14 ++++++++------ |
18 | tests/auto/auto.pro | 22 ++++++++++++---------- | 18 | tests/auto/auto.pro | 24 +++++++++++++----------- |
19 | 5 files changed, 30 insertions(+), 24 deletions(-) | 19 | 5 files changed, 33 insertions(+), 27 deletions(-) |
20 | 20 | ||
21 | diff --git a/examples/examples.pro b/examples/examples.pro | 21 | diff --git a/examples/examples.pro b/examples/examples.pro |
22 | index 4955969..8e86419 100644 | 22 | index 4955969..8e86419 100644 |
@@ -61,7 +61,7 @@ index e02ca8e..49527c5 100644 | |||
61 | components \ | 61 | components \ |
62 | designer \ | 62 | designer \ |
63 | diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro | 63 | diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro |
64 | index 2979a23..663bdd5 100644 | 64 | index 3a70580..a977878 100644 |
65 | --- a/src/linguist/linguist.pro | 65 | --- a/src/linguist/linguist.pro |
66 | +++ b/src/linguist/linguist.pro | 66 | +++ b/src/linguist/linguist.pro |
67 | @@ -3,7 +3,7 @@ SUBDIRS = \ | 67 | @@ -3,7 +3,7 @@ SUBDIRS = \ |
@@ -74,7 +74,7 @@ index 2979a23..663bdd5 100644 | |||
74 | qtNomakeTools( \ | 74 | qtNomakeTools( \ |
75 | linguist \ | 75 | linguist \ |
76 | diff --git a/src/src.pro b/src/src.pro | 76 | diff --git a/src/src.pro b/src/src.pro |
77 | index 866a199..ec08874 100644 | 77 | index a07a3bb..4c6b463 100644 |
78 | --- a/src/src.pro | 78 | --- a/src/src.pro |
79 | +++ b/src/src.pro | 79 | +++ b/src/src.pro |
80 | @@ -4,10 +4,12 @@ qtHaveModule(widgets) { | 80 | @@ -4,10 +4,12 @@ qtHaveModule(widgets) { |
@@ -82,7 +82,7 @@ index 866a199..ec08874 100644 | |||
82 | message("Some graphics-related tools are unavailable without PNG support") | 82 | message("Some graphics-related tools are unavailable without PNG support") |
83 | } else { | 83 | } else { |
84 | - SUBDIRS = assistant \ | 84 | - SUBDIRS = assistant \ |
85 | + !linguistonly { | 85 | + !linguistonly { |
86 | + SUBDIRS = assistant \ | 86 | + SUBDIRS = assistant \ |
87 | pixeltool \ | 87 | pixeltool \ |
88 | - qtestlib \ | 88 | - qtestlib \ |
@@ -93,6 +93,15 @@ index 866a199..ec08874 100644 | |||
93 | # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig | 93 | # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig |
94 | 94 | ||
95 | linguist.depends = designer | 95 | linguist.depends = designer |
96 | @@ -15,7 +17,7 @@ qtHaveModule(widgets) { | ||
97 | } | ||
98 | |||
99 | SUBDIRS += linguist | ||
100 | -if(!android|android_app):!ios: SUBDIRS += qtpaths | ||
101 | +!linguistonly:if(!android|android_app):!ios: SUBDIRS += qtpaths | ||
102 | |||
103 | mac { | ||
104 | SUBDIRS += macdeployqt | ||
96 | @@ -25,7 +27,7 @@ android { | 105 | @@ -25,7 +27,7 @@ android { |
97 | SUBDIRS += androiddeployqt | 106 | SUBDIRS += androiddeployqt |
98 | } | 107 | } |
@@ -101,12 +110,18 @@ index 866a199..ec08874 100644 | |||
101 | +!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus | 110 | +!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus |
102 | 111 | ||
103 | win32|winrt:SUBDIRS += windeployqt | 112 | win32|winrt:SUBDIRS += windeployqt |
113 | winrt:SUBDIRS += winrtrunner qtd3dservice | ||
114 | @@ -36,4 +38,4 @@ qtNomakeTools( \ | ||
115 | macdeployqt \ | ||
116 | ) | ||
104 | 117 | ||
118 | -!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag | ||
119 | +!linguistonly:!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag | ||
105 | diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro | 120 | diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro |
106 | index eaf440b..1778ad1 100644 | 121 | index c3acfe3..f2f88f7 100644 |
107 | --- a/tests/auto/auto.pro | 122 | --- a/tests/auto/auto.pro |
108 | +++ b/tests/auto/auto.pro | 123 | +++ b/tests/auto/auto.pro |
109 | @@ -1,14 +1,16 @@ | 124 | @@ -1,15 +1,17 @@ |
110 | TEMPLATE=subdirs | 125 | TEMPLATE=subdirs |
111 | -SUBDIRS=\ | 126 | -SUBDIRS=\ |
112 | - linguist \ | 127 | - linguist \ |
@@ -117,7 +132,8 @@ index eaf440b..1778ad1 100644 | |||
117 | - qhelpindexmodel \ | 132 | - qhelpindexmodel \ |
118 | - qhelpprojectdata \ | 133 | - qhelpprojectdata \ |
119 | - cmake \ | 134 | - cmake \ |
120 | - installed_cmake | 135 | - installed_cmake \ |
136 | - qtdiag | ||
121 | +!linguistonly { | 137 | +!linguistonly { |
122 | + SUBDIRS=\ | 138 | + SUBDIRS=\ |
123 | + linguist \ | 139 | + linguist \ |
@@ -129,10 +145,11 @@ index eaf440b..1778ad1 100644 | |||
129 | + qhelpprojectdata \ | 145 | + qhelpprojectdata \ |
130 | + cmake \ | 146 | + cmake \ |
131 | + installed_cmake | 147 | + installed_cmake |
148 | + qtdiag | ||
132 | +} | 149 | +} |
133 | 150 | ||
134 | installed_cmake.depends = cmake | 151 | installed_cmake.depends = cmake |
135 | 152 | ||
136 | -- | 153 | -- |
137 | 1.8.5.3 | 154 | 1.9.3 |
138 | 155 | ||
diff --git a/recipes-qt/qt5/qttools_5.2.1.bb b/recipes-qt/qt5/qttools_5.2.1.bb deleted file mode 100644 index d186a213..00000000 --- a/recipes-qt/qt5/qttools_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b" | ||
5 | SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5" | ||
diff --git a/recipes-qt/qt5/qttools_5.3.0.bb b/recipes-qt/qt5/qttools_5.3.0.bb new file mode 100644 index 00000000..d3956a7e --- /dev/null +++ b/recipes-qt/qt5/qttools_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "628a91ddfe34efc6622fdba8c6348855" | ||
5 | SRC_URI[sha256sum] = "f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250" | ||
diff --git a/recipes-qt/qt5/qtwayland-native.inc b/recipes-qt/qt5/qtwayland-native.inc index 78416e89..bddcc220 100644 --- a/recipes-qt/qt5/qtwayland-native.inc +++ b/recipes-qt/qt5/qtwayland-native.inc | |||
@@ -15,3 +15,9 @@ do_configure() { | |||
15 | do_install() { | 15 | do_install() { |
16 | oe_runmake install INSTALL_ROOT=${D} | 16 | oe_runmake install INSTALL_ROOT=${D} |
17 | } | 17 | } |
18 | |||
19 | # older copyright year than what e.g. qtbase is using now | ||
20 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
21 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
22 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
23 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index abeb15f3..bb52f0d6 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc | |||
@@ -22,3 +22,9 @@ FILES_${PN}-plugins += " \ | |||
22 | FILES_${PN}-plugins-dbg += " \ | 22 | FILES_${PN}-plugins-dbg += " \ |
23 | ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \ | 23 | ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \ |
24 | " | 24 | " |
25 | |||
26 | # older copyright year than what e.g. qtbase is using now | ||
27 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
28 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
29 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
30 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb b/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb deleted file mode 100644 index c16f91cd..00000000 --- a/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "ddad7d00ebd201a750242bd67b20ecf3" | ||
5 | SRC_URI[sha256sum] = "d5ecff99b4d35bc5f184503cabc394a554be48c368aba140f95019501645a7f5" | ||
diff --git a/recipes-qt/qt5/qtwebkit-examples_5.3.0.bb b/recipes-qt/qt5/qtwebkit-examples_5.3.0.bb new file mode 100644 index 00000000..d1400fd8 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-examples_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "4ab24c0bf04f21207a48f261ce0d7943" | ||
5 | SRC_URI[sha256sum] = "7e491050000c9608bf36f78bb3db5938b92e0dce89d686d903c85dc8fdadef38" | ||
diff --git a/recipes-qt/qt5/qtwebkit_5.2.1.bb b/recipes-qt/qt5/qtwebkit_5.2.1.bb deleted file mode 100644 index ef166f22..00000000 --- a/recipes-qt/qt5/qtwebkit_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "a20d99a1c2afbd6a7c6f54e615f1bd63" | ||
5 | SRC_URI[sha256sum] = "ac089723489ee9146020bd8fc715358249d8cea7f2a2e92a692e2a5595a46b5c" | ||
diff --git a/recipes-qt/qt5/qtwebkit_5.3.0.bb b/recipes-qt/qt5/qtwebkit_5.3.0.bb new file mode 100644 index 00000000..6e4b001a --- /dev/null +++ b/recipes-qt/qt5/qtwebkit_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "cc9197eaef9e7950e907635f9bde1e98" | ||
5 | SRC_URI[sha256sum] = "ceb1aeeede1febddbc10c5c23e6bcb18a90a5eb4d162d6f0b5075ff4ff3ba335" | ||
diff --git a/recipes-qt/qt5/qtx11extras.inc b/recipes-qt/qt5/qtx11extras.inc index bbb05a65..73f58984 100644 --- a/recipes-qt/qt5/qtx11extras.inc +++ b/recipes-qt/qt5/qtx11extras.inc | |||
@@ -1,3 +1,9 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | 2 | ||
3 | DEPENDS += "qtbase" | 3 | DEPENDS += "qtbase" |
4 | |||
5 | # older copyright year than what e.g. qtbase is using now | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
7 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
8 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
9 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtx11extras_5.2.1.bb b/recipes-qt/qt5/qtx11extras_5.2.1.bb deleted file mode 100644 index b619a4d5..00000000 --- a/recipes-qt/qt5/qtx11extras_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "ad94a2f14afc3f2dfe9743027860c28a" | ||
5 | SRC_URI[sha256sum] = "4f62647772d37d27921a77caf6e02c51fb207c5a1d604b0b3047a92d0163d4b9" | ||
diff --git a/recipes-qt/qt5/qtx11extras_5.3.0.bb b/recipes-qt/qt5/qtx11extras_5.3.0.bb new file mode 100644 index 00000000..61b58142 --- /dev/null +++ b/recipes-qt/qt5/qtx11extras_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "83fc516c7f6ab82599b3f6e46744cb85" | ||
5 | SRC_URI[sha256sum] = "92d1c051294d92a250a405c120673721865b37d8f5db4eaac4b3f7fe46707719" | ||
diff --git a/recipes-qt/qt5/qtxmlpatterns.inc b/recipes-qt/qt5/qtxmlpatterns.inc index bbb05a65..73f58984 100644 --- a/recipes-qt/qt5/qtxmlpatterns.inc +++ b/recipes-qt/qt5/qtxmlpatterns.inc | |||
@@ -1,3 +1,9 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | 2 | ||
3 | DEPENDS += "qtbase" | 3 | DEPENDS += "qtbase" |
4 | |||
5 | # older copyright year than what e.g. qtbase is using now | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | ||
7 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
8 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
9 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb deleted file mode 100644 index ab5570c0..00000000 --- a/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "d01c6b837db4a6dee69a3f0352b37e18" | ||
5 | SRC_URI[sha256sum] = "bed7b5edd8efc3d5b45c60b5ed949aec6a4daadb5f3bd9029467e90c4ef566d2" | ||
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.3.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.3.0.bb new file mode 100644 index 00000000..754350f0 --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns_5.3.0.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require qt5-${PV}.inc | ||
2 | require ${PN}.inc | ||
3 | |||
4 | SRC_URI[md5sum] = "68c6e1311ecf8727368961739243d3b2" | ||
5 | SRC_URI[sha256sum] = "ac66c182f28a3909dc939a111d2bf701056f6c68cecde54074c9c34637cdc988" | ||