diff options
46 files changed, 170 insertions, 170 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index a2cc1fc3..94b04625 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | # Select which version you prefer by defining QT5_VERSION and including this file | 1 | # Select which version you prefer by defining QT5_VERSION and including this file |
2 | # possible values now "5.2.1", "5.2.1+git%" | 2 | # possible values now "5.3.0", "5.3.0+git%" |
3 | 3 | ||
4 | QT5_VERSION ?= "5.2.1" | 4 | QT5_VERSION ?= "5.3.0" |
5 | 5 | ||
6 | PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" | 6 | PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" |
7 | PREFERRED_VERSION_qtbase = "${QT5_VERSION}" | 7 | PREFERRED_VERSION_qtbase = "${QT5_VERSION}" |
@@ -24,4 +24,9 @@ PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" | |||
24 | PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}" | 24 | PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}" |
25 | PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" | 25 | PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" |
26 | PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" | 26 | PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}" |
27 | PREFERRED_VERSION_qtwebsockets = "${QT5_VERSION}" | ||
27 | PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" | 28 | PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" |
29 | |||
30 | # qtenginio doesn't follow qt5 versioning, see https://bugreports.qt-project.org/browse/QTBUG-37791 | ||
31 | QT5_VERSION_QTENGINIO = "${@base_contains('QT5_VERSION', '5.3.0+git%', '${QT5_VERSION}', '1.0.4%', d)}" | ||
32 | PREFERRED_VERSION_qtenginio = "${QT5_VERSION_QTENGINIO}" | ||
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index cac16a00..7c456931 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -14,19 +14,19 @@ SRC_URI += "\ | |||
14 | file://0002-Add-external-hostbindir-option.patch \ | 14 | file://0002-Add-external-hostbindir-option.patch \ |
15 | file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ | 15 | file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ |
16 | file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ | 16 | file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ |
17 | file://0001-Fix-missing-plugin_types.patch \ | 17 | file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ |
18 | file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ | 18 | file://0001-Revert-Use-the-gcc-feature-in-simd.prf.patch \ |
19 | " | 19 | " |
20 | 20 | ||
21 | # common with native version | 21 | # common with native version |
22 | SRC_URI += " \ | 22 | SRC_URI += " \ |
23 | file://0008-Always-build-uic.patch \ | 23 | file://0006-Always-build-uic.patch \ |
24 | " | 24 | " |
25 | 25 | ||
26 | # specific for nativesdk version | 26 | # specific for nativesdk version |
27 | SRC_URI += " \ | 27 | SRC_URI += " \ |
28 | file://0009-configure-preserve-built-qmake-and-swap-with-native-.patch \ | 28 | file://0007-configure-preserve-built-qmake-and-swap-with-native-.patch \ |
29 | file://0010-configure-bump-path-length-from-256-to-512-character.patch \ | 29 | file://0008-configure-bump-path-length-from-256-to-512-character.patch \ |
30 | " | 30 | " |
31 | 31 | ||
32 | SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114" | 32 | SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2" |
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb index cbf1672a..933119c3 100644 --- a/recipes-qt/qt5/nativesdk-qttools_git.bb +++ b/recipes-qt/qt5/nativesdk-qttools_git.bb | |||
@@ -4,7 +4,7 @@ require ${PN}.inc | |||
4 | # prepend this again, because ${PN}.inc prepneds ${PN} | 4 | # prepend this again, because ${PN}.inc prepneds ${PN} |
5 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" | 5 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" |
6 | 6 | ||
7 | SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f" | 7 | SRCREV = "eaf069902111533f0e675ab32279bb57a5916169" |
8 | 8 | ||
9 | # older copyright year than what e.g. qtbase is using now | 9 | # older copyright year than what e.g. qtbase is using now |
10 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 10 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 0438dd9d..2e325491 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -4,4 +4,4 @@ require ${PN}.inc | |||
4 | QT_MODULE_BRANCH = "master" | 4 | QT_MODULE_BRANCH = "master" |
5 | 5 | ||
6 | # last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already | 6 | # last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already |
7 | SRCREV = "36a829ad6fb44fd01f490c35e011f6fd2470ffdd" | 7 | SRCREV = "bdb98baf8253c69949a8c259369203da9ffb269c" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 25b7a627..3e714e0a 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -10,7 +10,7 @@ SRC_URI += " \ | |||
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | PV = "5.2.1+5.3.0-beta1+git${SRCPV}" | 13 | PV = "5.3.0+git${SRCPV}" |
14 | 14 | ||
15 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" | 15 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" |
16 | 16 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index 828f5ea5..95841ce3 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 237a4b0143d91c0573ecf6f9ff5e37827a14a75d Mon Sep 17 00:00:00 2001 | 1 | From e70bd40730582e5e5531fca51a1574cb306c40d3 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: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH 01/10] Add linux-oe-g++ platform | 4 | Subject: [PATCH 1/8] Add linux-oe-g++ platform |
5 | 5 | ||
6 | * This qmake.conf unlike other platforms reads most variables from | 6 | * This qmake.conf unlike other platforms reads most variables from |
7 | shell environment, because it's easier for qt recipes to export | 7 | shell environment, because it's easier for qt recipes to export |
@@ -42,16 +42,16 @@ Upstream-Status: Inappropriate [embedded specific] | |||
42 | 42 | ||
43 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 43 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
44 | --- | 44 | --- |
45 | configure | 60 +++++++++++++++------ | 45 | configure | 66 ++++++++++++++++------- |
46 | mkspecs/features/configure.prf | 4 +- | 46 | mkspecs/features/configure.prf | 4 +- |
47 | mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ | 47 | mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ |
48 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ | 48 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ |
49 | 4 files changed, 185 insertions(+), 19 deletions(-) | 49 | 4 files changed, 188 insertions(+), 22 deletions(-) |
50 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf | 50 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf |
51 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 51 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
52 | 52 | ||
53 | diff --git a/configure b/configure | 53 | diff --git a/configure b/configure |
54 | index 55d68ef..bb24a9c 100755 | 54 | index d5c2b08..4eae0d3 100755 |
55 | --- a/configure | 55 | --- a/configure |
56 | +++ b/configure | 56 | +++ b/configure |
57 | @@ -324,6 +324,16 @@ getQMakeConf() | 57 | @@ -324,6 +324,16 @@ getQMakeConf() |
@@ -118,7 +118,7 @@ index 55d68ef..bb24a9c 100755 | |||
118 | # Use CC/CXX to run config.tests | 118 | # Use CC/CXX to run config.tests |
119 | mkdir -p "$outpath/config.tests" | 119 | mkdir -p "$outpath/config.tests" |
120 | rm -f "$outpath/config.tests/.qmake.cache" | 120 | rm -f "$outpath/config.tests/.qmake.cache" |
121 | @@ -3139,7 +3157,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | 121 | @@ -3140,7 +3158,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then |
122 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no | 122 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no |
123 | fi | 123 | fi |
124 | 124 | ||
@@ -127,7 +127,7 @@ index 55d68ef..bb24a9c 100755 | |||
127 | 127 | ||
128 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 128 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
129 | 129 | ||
130 | @@ -3174,7 +3192,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 130 | @@ -3175,7 +3193,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then |
131 | exit 1 | 131 | exit 1 |
132 | fi | 132 | fi |
133 | fi | 133 | fi |
@@ -136,7 +136,7 @@ index 55d68ef..bb24a9c 100755 | |||
136 | 136 | ||
137 | GCC_MACHINE_DUMP= | 137 | GCC_MACHINE_DUMP= |
138 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac | 138 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac |
139 | @@ -3632,6 +3650,14 @@ setBootstrapVariable() | 139 | @@ -3633,6 +3651,14 @@ setBootstrapVariable() |
140 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" | 140 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" |
141 | } | 141 | } |
142 | 142 | ||
@@ -151,20 +151,26 @@ index 55d68ef..bb24a9c 100755 | |||
151 | # build qmake | 151 | # build qmake |
152 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 152 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
153 | echo "Creating qmake..." | 153 | echo "Creating qmake..." |
154 | @@ -3670,11 +3696,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 154 | @@ -3671,14 +3697,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
155 | fi | 155 | fi |
156 | 156 | ||
157 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= | 157 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= |
158 | - setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" | 158 | - setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" |
159 | - setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" | 159 | - setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" |
160 | - setBootstrapVariable QMAKE_CFLAGS | 160 | - setBootstrapVariable QMAKE_CFLAGS |
161 | - setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS | ||
161 | - setBootstrapVariable QMAKE_CXXFLAGS | 162 | - setBootstrapVariable QMAKE_CXXFLAGS |
163 | - setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS | ||
162 | - setBootstrapVariable QMAKE_LFLAGS | 164 | - setBootstrapVariable QMAKE_LFLAGS |
165 | - setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS | ||
163 | + setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" | 166 | + setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" |
164 | + setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" | 167 | + setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" |
165 | + setBootstrapEvalVariable QMAKE_CFLAGS | 168 | + setBootstrapEvalVariable QMAKE_CFLAGS |
169 | + setBootstrapEvalVariable QMAKE_CFLAGS_SPLIT_SECTIONS | ||
166 | + setBootstrapEvalVariable QMAKE_CXXFLAGS | 170 | + setBootstrapEvalVariable QMAKE_CXXFLAGS |
171 | + setBootstrapEvalVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS | ||
167 | + setBootstrapEvalVariable QMAKE_LFLAGS | 172 | + setBootstrapEvalVariable QMAKE_LFLAGS |
173 | + setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS | ||
168 | 174 | ||
169 | if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then | 175 | if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then |
170 | setBootstrapVariable QMAKE_CFLAGS_RELEASE | 176 | setBootstrapVariable QMAKE_CFLAGS_RELEASE |
@@ -340,5 +346,5 @@ index 0000000..dd12003 | |||
340 | + | 346 | + |
341 | +#endif // QPLATFORMDEFS_H | 347 | +#endif // QPLATFORMDEFS_H |
342 | -- | 348 | -- |
343 | 1.9.1 | 349 | 2.0.0 |
344 | 350 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch deleted file mode 100644 index 612cbdda..00000000 --- a/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
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-git/0001-Revert-Use-the-gcc-feature-in-simd.prf.patch b/recipes-qt/qt5/qtbase-git/0001-Revert-Use-the-gcc-feature-in-simd.prf.patch new file mode 100644 index 00000000..88f5c122 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0001-Revert-Use-the-gcc-feature-in-simd.prf.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 9d33599f12787f85a19e8147604f919ac40c02c1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 4 Jun 2014 15:26:11 +0200 | ||
4 | Subject: [PATCH] Revert "Use the "gcc" feature in simd.prf" | ||
5 | |||
6 | It's causing linker issues, see my comment in: | ||
7 | https://bugreports.qt-project.org/browse/QTBUG-38544 | ||
8 | |||
9 | This reverts commit 3b00cc480400d47c59c29d3507c7fcdc9be2a489. | ||
10 | --- | ||
11 | mkspecs/features/simd.prf | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf | ||
15 | index 62a63f9..4f86f60 100644 | ||
16 | --- a/mkspecs/features/simd.prf | ||
17 | +++ b/mkspecs/features/simd.prf | ||
18 | @@ -18,7 +18,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) | ||
19 | # | ||
20 | # Set up compilers for SIMD (SSE/AVX, NEON etc) | ||
21 | # | ||
22 | -gcc { # includes intel_icc and clang variants | ||
23 | +*-g++*|intel_icc|*-clang*|*-qcc* { | ||
24 | sse2 { | ||
25 | HEADERS += $$SSE2_HEADERS | ||
26 | |||
27 | -- | ||
28 | 2.0.0 | ||
29 | |||
diff --git a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch index 5f9fd90d..81f18674 100644 --- a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 00ad866f82f89ce938e9eaabfc50af3cde72ccfe Mon Sep 17 00:00:00 2001 | 1 | From eaa4a4c13e65e29e2214a01b69b77b9c6f2ada05 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, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 02/10] Add -external-hostbindir option | 4 | Subject: [PATCH 2/8] Add -external-hostbindir option |
5 | 5 | ||
6 | * when cross-compiling it's sometimes useful to use existing tools from machine | 6 | * when cross-compiling it's sometimes useful to use existing tools from machine |
7 | (or in OpenEmbedded built with separate native recipe) when building for target | 7 | (or in OpenEmbedded built with separate native recipe) when building for target |
@@ -24,7 +24,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
24 | Signed-off-by: Simon Busch <morphis@gravedo.de> | 24 | Signed-off-by: Simon Busch <morphis@gravedo.de> |
25 | --- | 25 | --- |
26 | configure | 15 +++++++++++++++ | 26 | configure | 15 +++++++++++++++ |
27 | mkspecs/features/qt_functions.prf | 9 ++++++++- | 27 | mkspecs/features/qt_functions.prf | 2 +- |
28 | mkspecs/features/qt_tool.prf | 3 +-- | 28 | mkspecs/features/qt_tool.prf | 3 +-- |
29 | qmake/property.cpp | 1 + | 29 | qmake/property.cpp | 1 + |
30 | qtbase.pro | 12 +++++++++--- | 30 | qtbase.pro | 12 +++++++++--- |
@@ -34,10 +34,10 @@ Signed-off-by: Simon Busch <morphis@gravedo.de> | |||
34 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- | 34 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- |
35 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- | 35 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- |
36 | tools/configure/configureapp.cpp | 8 ++++++++ | 36 | tools/configure/configureapp.cpp | 8 ++++++++ |
37 | 11 files changed, 51 insertions(+), 13 deletions(-) | 37 | 11 files changed, 44 insertions(+), 13 deletions(-) |
38 | 38 | ||
39 | diff --git a/configure b/configure | 39 | diff --git a/configure b/configure |
40 | index bb24a9c..bf7c11e 100755 | 40 | index 4eae0d3..48d5119 100755 |
41 | --- a/configure | 41 | --- a/configure |
42 | +++ b/configure | 42 | +++ b/configure |
43 | @@ -777,6 +777,7 @@ QT_HOST_BINS= | 43 | @@ -777,6 +777,7 @@ QT_HOST_BINS= |
@@ -48,7 +48,7 @@ index bb24a9c..bf7c11e 100755 | |||
48 | 48 | ||
49 | #flags for SQL drivers | 49 | #flags for SQL drivers |
50 | QT_CFLAGS_PSQL= | 50 | QT_CFLAGS_PSQL= |
51 | @@ -898,6 +899,7 @@ while [ "$#" -gt 0 ]; do | 51 | @@ -896,6 +897,7 @@ while [ "$#" -gt 0 ]; do |
52 | -testsdir| \ | 52 | -testsdir| \ |
53 | -hostdatadir| \ | 53 | -hostdatadir| \ |
54 | -hostbindir| \ | 54 | -hostbindir| \ |
@@ -56,7 +56,7 @@ index bb24a9c..bf7c11e 100755 | |||
56 | -hostlibdir| \ | 56 | -hostlibdir| \ |
57 | -extprefix| \ | 57 | -extprefix| \ |
58 | -sysroot| \ | 58 | -sysroot| \ |
59 | @@ -1112,6 +1114,9 @@ while [ "$#" -gt 0 ]; do | 59 | @@ -1110,6 +1112,9 @@ while [ "$#" -gt 0 ]; do |
60 | extprefix) | 60 | extprefix) |
61 | QT_EXT_PREFIX="$VAL" | 61 | QT_EXT_PREFIX="$VAL" |
62 | ;; | 62 | ;; |
@@ -66,7 +66,7 @@ index bb24a9c..bf7c11e 100755 | |||
66 | pkg-config) | 66 | pkg-config) |
67 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 67 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
68 | CFG_PKGCONFIG="$VAL" | 68 | CFG_PKGCONFIG="$VAL" |
69 | @@ -2250,6 +2255,10 @@ Installation options: | 69 | @@ -2248,6 +2253,10 @@ Installation options: |
70 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> | 70 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> |
71 | (default HOSTPREFIX) | 71 | (default HOSTPREFIX) |
72 | 72 | ||
@@ -77,7 +77,7 @@ index bb24a9c..bf7c11e 100755 | |||
77 | Configure options: | 77 | Configure options: |
78 | 78 | ||
79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
80 | @@ -2914,6 +2923,11 @@ fi | 80 | @@ -2915,6 +2924,11 @@ fi |
81 | # command line and environment validation | 81 | # command line and environment validation |
82 | #------------------------------------------------------------------------------- | 82 | #------------------------------------------------------------------------------- |
83 | 83 | ||
@@ -89,7 +89,7 @@ index bb24a9c..bf7c11e 100755 | |||
89 | # update QT_CONFIG to show our current predefined configuration | 89 | # update QT_CONFIG to show our current predefined configuration |
90 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h | 90 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h |
91 | case "$CFG_QCONFIG" in | 91 | case "$CFG_QCONFIG" in |
92 | @@ -3594,6 +3608,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { | 92 | @@ -3595,6 +3609,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { |
93 | "qt_hbinpath=$QT_HOST_BINS", | 93 | "qt_hbinpath=$QT_HOST_BINS", |
94 | "qt_hlibpath=$QT_HOST_LIBS", | 94 | "qt_hlibpath=$QT_HOST_LIBS", |
95 | "qt_hdatpath=$QT_HOST_DATA", | 95 | "qt_hdatpath=$QT_HOST_DATA", |
@@ -98,27 +98,20 @@ index bb24a9c..bf7c11e 100755 | |||
98 | "qt_hostspec=$shortspec", | 98 | "qt_hostspec=$shortspec", |
99 | #endif | 99 | #endif |
100 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 100 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
101 | index 1dacfed..7229845 100644 | 101 | index d41fe3b..050a4a7 100644 |
102 | --- a/mkspecs/features/qt_functions.prf | 102 | --- a/mkspecs/features/qt_functions.prf |
103 | +++ b/mkspecs/features/qt_functions.prf | 103 | +++ b/mkspecs/features/qt_functions.prf |
104 | @@ -193,7 +193,14 @@ defineTest(qtAddRpathLink) { | 104 | @@ -193,7 +193,7 @@ defineTest(qtAddRpathLink) { |
105 | defineTest(qtPrepareTool) { | 105 | defineTest(qtPrepareTool) { |
106 | $$1 = $$eval(QT_TOOL.$${2}.binary) | 106 | cmd = $$eval(QT_TOOL.$${2}.binary) |
107 | isEmpty($$1) { | 107 | isEmpty(cmd) { |
108 | - $$1 = $$[QT_HOST_BINS]/$$2 | 108 | - cmd = $$[QT_HOST_BINS]/$$2 |
109 | + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 | 109 | + cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2 |
110 | + # for some reason isEmpty does not work here, FIXME before submitting upstream | 110 | exists($${cmd}.pl) { |
111 | + # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) | 111 | cmd = perl -w $$system_path($${cmd}.pl) |
112 | + # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true | ||
113 | + # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch | ||
114 | + !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { | ||
115 | + $$1 = $$[QT_HOST_BINS]/$$2 | ||
116 | + } | ||
117 | exists($$eval($$1).pl) { | ||
118 | $$1 = perl -w $$eval($$1).pl | ||
119 | } else: contains(QMAKE_HOST.os, Windows) { | 112 | } else: contains(QMAKE_HOST.os, Windows) { |
120 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf | 113 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf |
121 | index f0864f9..50bfac8 100644 | 114 | index 1d3e88c..bd44754 100644 |
122 | --- a/mkspecs/features/qt_tool.prf | 115 | --- a/mkspecs/features/qt_tool.prf |
123 | +++ b/mkspecs/features/qt_tool.prf | 116 | +++ b/mkspecs/features/qt_tool.prf |
124 | @@ -15,8 +15,7 @@ CONFIG += console | 117 | @@ -15,8 +15,7 @@ CONFIG += console |
@@ -144,7 +137,7 @@ index e50485c..71291ad 100644 | |||
144 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, | 137 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, |
145 | }; | 138 | }; |
146 | diff --git a/qtbase.pro b/qtbase.pro | 139 | diff --git a/qtbase.pro b/qtbase.pro |
147 | index ed6fc39..2421f41 100644 | 140 | index d6861cf..92e6a83 100644 |
148 | --- a/qtbase.pro | 141 | --- a/qtbase.pro |
149 | +++ b/qtbase.pro | 142 | +++ b/qtbase.pro |
150 | @@ -71,16 +71,22 @@ CONFIG -= qt | 143 | @@ -71,16 +71,22 @@ CONFIG -= qt |
@@ -273,7 +266,7 @@ index 99d87e2..5621dc0 100644 | |||
273 | _qt5_Widgets_check_file_exists(${imported_location}) | 266 | _qt5_Widgets_check_file_exists(${imported_location}) |
274 | 267 | ||
275 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 268 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
276 | index cff3f1b..540708b 100644 | 269 | index b756509..7e61845 100644 |
277 | --- a/tools/configure/configureapp.cpp | 270 | --- a/tools/configure/configureapp.cpp |
278 | +++ b/tools/configure/configureapp.cpp | 271 | +++ b/tools/configure/configureapp.cpp |
279 | @@ -1213,6 +1213,13 @@ void Configure::parseCmdLine() | 272 | @@ -1213,6 +1213,13 @@ void Configure::parseCmdLine() |
@@ -290,7 +283,7 @@ index cff3f1b..540708b 100644 | |||
290 | else if (configCmdLine.at(i) == "-make-tool") { | 283 | else if (configCmdLine.at(i) == "-make-tool") { |
291 | ++i; | 284 | ++i; |
292 | if (i == argCount) | 285 | if (i == argCount) |
293 | @@ -3986,6 +3993,7 @@ void Configure::generateQConfigCpp() | 286 | @@ -3983,6 +3990,7 @@ void Configure::generateQConfigCpp() |
294 | << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl | 287 | << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl |
295 | << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl | 288 | << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl |
296 | << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl | 289 | << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl |
@@ -299,5 +292,5 @@ index cff3f1b..540708b 100644 | |||
299 | << " \"qt_hostspec=" << hostSpec << "\"," << endl | 292 | << " \"qt_hostspec=" << hostSpec << "\"," << endl |
300 | << "#endif" << endl | 293 | << "#endif" << endl |
301 | -- | 294 | -- |
302 | 1.9.1 | 295 | 2.0.0 |
303 | 296 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 95c67a88..4b4e47ce 100644 --- a/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From 53b152be24082a2cf2497d2e687f9ee73a39d6f4 Mon Sep 17 00:00:00 2001 | 1 | From b76b34a03c3051cda5330c8ae9f5e2a26c5c4da6 Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH 03/10] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 3/8] qlibraryinfo: allow to set qt.conf from the outside using |
5 | using the environment | 5 | the environment |
6 | 6 | ||
7 | Allow to set a qt.conf from the outside using the environment. This allows | 7 | Allow to set a qt.conf from the outside using the environment. This allows |
8 | to inject new prefixes and other paths into qmake. This is needed when using | 8 | to inject new prefixes and other paths into qmake. This is needed when using |
@@ -35,5 +35,5 @@ index 3686b17..89e13cf 100644 | |||
35 | if(!QFile::exists(qtconfig)) | 35 | if(!QFile::exists(qtconfig)) |
36 | qtconfig = qt_libraryInfoFile(); | 36 | qtconfig = qt_libraryInfoFile(); |
37 | -- | 37 | -- |
38 | 1.9.1 | 38 | 2.0.0 |
39 | 39 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index c263d094..1e5ffacf 100644 --- a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a39f5e64b7b5a31e7e5cd988b5f967ce6cf02990 Mon Sep 17 00:00:00 2001 | 1 | From 83205b1344e57e2cb0292cf1d276e40c7f45ca32 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 22:33:33 +0200 | 3 | Date: Sat, 27 Apr 2013 22:33:33 +0200 |
4 | Subject: [PATCH 04/10] configureapp: Prefix default LIBDIRS and INCDIRS with | 4 | Subject: [PATCH 4/8] configureapp: Prefix default LIBDIRS and INCDIRS with |
5 | SYSROOT | 5 | SYSROOT |
6 | 6 | ||
7 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
@@ -11,7 +11,7 @@ Upstream-Status: Pending | |||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 2 insertions(+), 2 deletions(-) |
12 | 12 | ||
13 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 13 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
14 | index 540708b..45f4a1e 100644 | 14 | index 7e61845..29c6358 100644 |
15 | --- a/tools/configure/configureapp.cpp | 15 | --- a/tools/configure/configureapp.cpp |
16 | +++ b/tools/configure/configureapp.cpp | 16 | +++ b/tools/configure/configureapp.cpp |
17 | @@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri() | 17 | @@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri() |
@@ -26,5 +26,5 @@ index 540708b..45f4a1e 100644 | |||
26 | configStream << "}" << endl; | 26 | configStream << "}" << endl; |
27 | configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; | 27 | configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; |
28 | -- | 28 | -- |
29 | 1.9.1 | 29 | 2.0.0 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch index 65ebbd1c..213a9c34 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +++ b/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 91b185d1f4843d22d42461c0aee4cd0f5393bbc8 Mon Sep 17 00:00:00 2001 | 1 | From 22775e5f0b1097964062fbcf1805a841f971de34 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: Mon, 21 Apr 2014 19:22:04 +0200 | 3 | Date: Mon, 21 Apr 2014 19:22:04 +0200 |
4 | Subject: [PATCH] Revert "eglfs: Print the chosen config in debug mode" | 4 | Subject: [PATCH 5/8] Revert "eglfs: Print the chosen config in debug mode" |
5 | 5 | ||
6 | This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. | 6 | This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. |
7 | --- | 7 | --- |
@@ -10,10 +10,10 @@ This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. | |||
10 | 2 files changed, 3 insertions(+), 8 deletions(-) | 10 | 2 files changed, 3 insertions(+), 8 deletions(-) |
11 | 11 | ||
12 | diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp | 12 | diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp |
13 | index e6624fb..3870f6c 100644 | 13 | index 5eed470..39c7c1f 100644 |
14 | --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp | 14 | --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp |
15 | +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp | 15 | +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp |
16 | @@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) | 16 | @@ -451,9 +451,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) |
17 | for (index = 0; attrs[index].attr != -1; ++index) { | 17 | for (index = 0; attrs[index].attr != -1; ++index) { |
18 | EGLint value; | 18 | EGLint value; |
19 | if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) { | 19 | if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) { |
@@ -52,5 +52,5 @@ index eec6463..4a7c69b 100644 | |||
52 | // Make the context current to ensure the GL version query works. This needs a surface too. | 52 | // Make the context current to ensure the GL version query works. This needs a surface too. |
53 | const EGLint pbufferAttributes[] = { | 53 | const EGLint pbufferAttributes[] = { |
54 | -- | 54 | -- |
55 | 1.9.1 | 55 | 2.0.0 |
56 | 56 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch index fd45516a..f425c3e7 100644 --- a/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4d5502114a3135f2c78eb9e63476918cbee00040 Mon Sep 17 00:00:00 2001 | 1 | From dd679f743291a924bed500a866eb05fab71c9978 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 08/10] Always build uic | 4 | Subject: [PATCH 6/8] Always build uic |
5 | 5 | ||
6 | Even if we are not building gui or widgets. This tool is needed later | 6 | Even if we are not building gui or widgets. This tool is needed later |
7 | as a native tool when compiling the target. | 7 | as a native tool when compiling the target. |
@@ -27,5 +27,5 @@ index 6a805a6..90623a6 100644 | |||
27 | nacl: SUBDIRS -= src_network src_testlib | 27 | nacl: SUBDIRS -= src_network src_testlib |
28 | 28 | ||
29 | -- | 29 | -- |
30 | 1.9.1 | 30 | 2.0.0 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index 395e84cc..6d79acb6 100644 --- a/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From c0c4c468cc70a367e3bb2dd4a48c31e62b3b0fa4 Mon Sep 17 00:00:00 2001 | 1 | From d8e725cb2c25a443d888fe2652f9039e79ae75ac Mon Sep 17 00:00:00 2001 |
2 | From: Michael Krelin <hacker@klever.net> | 2 | From: Michael Krelin <hacker@klever.net> |
3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 | 3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 |
4 | Subject: [PATCH 05/10] qmake: don't build it in configure, but allow to build | 4 | Subject: [PATCH 6/8] qmake: don't build it in configure, but allow to build it |
5 | it separately | 5 | separately |
6 | 6 | ||
7 | * it is already built in qtbase-native, so we don't need it in configure | 7 | * it is already built in qtbase-native, so we don't need it in configure |
8 | * allow building a separate qmake for the target | 8 | * allow building a separate qmake for the target |
@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
20 | 2 files changed, 3 insertions(+), 1 deletion(-) | 20 | 2 files changed, 3 insertions(+), 1 deletion(-) |
21 | 21 | ||
22 | diff --git a/configure b/configure | 22 | diff --git a/configure b/configure |
23 | index bf7c11e..5e93ce4 100755 | 23 | index 48d5119..2a42c08 100755 |
24 | --- a/configure | 24 | --- a/configure |
25 | +++ b/configure | 25 | +++ b/configure |
26 | @@ -3674,7 +3674,7 @@ setBootstrapEvalVariable() | 26 | @@ -3675,7 +3675,7 @@ setBootstrapEvalVariable() |
27 | 27 | ||
28 | 28 | ||
29 | # build qmake | 29 | # build qmake |
@@ -46,5 +46,5 @@ index 89d6ea5..7c605b9 100644 | |||
46 | VPATH += \ | 46 | VPATH += \ |
47 | ../src/corelib/global \ | 47 | ../src/corelib/global \ |
48 | -- | 48 | -- |
49 | 1.9.1 | 49 | 2.0.0 |
50 | 50 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch index ddd7116f..79ac5e89 100644 --- a/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 7117e71f5e1aac3ac6e5e87852c108bbc13dc364 Mon Sep 17 00:00:00 2001 | 1 | From 3db5991e607a82403272b0ea821fc84e3c8b6d2a Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 | 3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 |
4 | Subject: [PATCH 09/10] configure: preserve built qmake and swap with native | 4 | Subject: [PATCH 7/8] configure: preserve built qmake and swap with native one |
5 | one | ||
6 | 5 | ||
7 | Let configure script build the real qmake, but right after it's built, swap | 6 | Let configure script build the real qmake, but right after it's built, swap |
8 | it with a native qmake for further internal use, preserving the real one. | 7 | it with a native qmake for further internal use, preserving the real one. |
@@ -13,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
13 | 1 file changed, 2 insertions(+) | 12 | 1 file changed, 2 insertions(+) |
14 | 13 | ||
15 | diff --git a/configure b/configure | 14 | diff --git a/configure b/configure |
16 | index 5e93ce4..01fca8f 100755 | 15 | index 48d5119..b7aac15 100755 |
17 | --- a/configure | 16 | --- a/configure |
18 | +++ b/configure | 17 | +++ b/configure |
19 | @@ -3821,6 +3821,8 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ]; | 18 | @@ -3825,6 +3825,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
20 | 19 | ||
21 | (cd "$outpath/qmake"; "$MAKE") || exit 2 | 20 | (cd "$outpath/qmake"; "$MAKE") || exit 2 |
22 | fi # Build qmake | 21 | fi # Build qmake |
@@ -26,5 +25,5 @@ index 5e93ce4..01fca8f 100755 | |||
26 | echo "Running configuration tests..." | 25 | echo "Running configuration tests..." |
27 | 26 | ||
28 | -- | 27 | -- |
29 | 1.9.1 | 28 | 2.0.0 |
30 | 29 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch index 21821c38..f8a789cd 100644 --- a/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ b/recipes-qt/qt5/qtbase-git/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2cb0f75bb9ab1e6709fe867887f9e6014a140356 Mon Sep 17 00:00:00 2001 | 1 | From cc8bd33740ee16b29e0801dbc2228314ef3cef2f Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 5 Feb 2014 18:35:08 +0100 | 3 | Date: Wed, 5 Feb 2014 18:35:08 +0100 |
4 | Subject: [PATCH 06/10] eglfs: fix egl error for platforms only supporting one | 4 | Subject: [PATCH 7/8] eglfs: fix egl error for platforms only supporting one |
5 | window/surface | 5 | window/surface |
6 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
7 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
@@ -68,5 +68,5 @@ index 2d36c0b..854531e 100644 | |||
68 | 68 | ||
69 | if (isRaster()) { | 69 | if (isRaster()) { |
70 | -- | 70 | -- |
71 | 1.9.1 | 71 | 2.0.0 |
72 | 72 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch index 02eef9bf..e5a3890a 100644 --- a/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 6afe8d5d1daf94ac64478406b5b84b6879981446 Mon Sep 17 00:00:00 2001 | 1 | From 3eabdee39cad37a4ce451486fce20680f169a0f1 Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 | 3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 |
4 | Subject: [PATCH 10/10] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 8/8] configure: bump path length from 256 to 512 characters |
5 | 5 | ||
6 | Increase the path length that gets hardcoded into generated config.cpp file | 6 | Increase the path length that gets hardcoded into generated config.cpp file |
7 | from 256 to 512 characters, as nativesdk path can be quite long. | 7 | from 256 to 512 characters, as nativesdk path can be quite long. |
@@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/configure b/configure | 14 | diff --git a/configure b/configure |
15 | index 01fca8f..801c7c1 100755 | 15 | index b7aac15..c51f785 100755 |
16 | --- a/configure | 16 | --- a/configure |
17 | +++ b/configure | 17 | +++ b/configure |
18 | @@ -3572,7 +3572,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ | 18 | @@ -3573,7 +3573,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ |
19 | static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; | 19 | static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; |
20 | 20 | ||
21 | /* Installation Info */ | 21 | /* Installation Info */ |
@@ -25,5 +25,5 @@ index 01fca8f..801c7c1 100755 | |||
25 | "qt_prfxpath=$QT_SYSROOT_PREFIX", | 25 | "qt_prfxpath=$QT_SYSROOT_PREFIX", |
26 | "qt_docspath=$QT_SYSROOT_DOCS", | 26 | "qt_docspath=$QT_SYSROOT_DOCS", |
27 | -- | 27 | -- |
28 | 1.9.1 | 28 | 2.0.0 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 24ae7ea4..2f4d80cd 100644 --- a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase-git/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0923f72a444bcdc0675a24aec9782692b41d301c Mon Sep 17 00:00:00 2001 | 1 | From 959b2fb8d8eb5e755e3d9d3d3031b996f96fb23b 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, 19 Mar 2014 18:32:28 +0100 | 3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 |
4 | Subject: [PATCH 07/10] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 8/8] qeglplatformintegration: Undefine CursorShape from X.h |
5 | 5 | ||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
7 | --- | 7 | --- |
@@ -26,5 +26,5 @@ index f665455..9eb783c 100644 | |||
26 | 26 | ||
27 | class QEGLPlatformScreen; | 27 | class QEGLPlatformScreen; |
28 | -- | 28 | -- |
29 | 1.9.1 | 29 | 2.0.0 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index bafe37ba..e10748f0 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -11,13 +11,13 @@ SRC_URI += "\ | |||
11 | file://0002-Add-external-hostbindir-option.patch \ | 11 | file://0002-Add-external-hostbindir-option.patch \ |
12 | file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ | 12 | file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ |
13 | file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ | 13 | file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ |
14 | file://0001-Fix-missing-plugin_types.patch \ | 14 | file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ |
15 | file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ | 15 | file://0001-Revert-Use-the-gcc-feature-in-simd.prf.patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | # specific for native version | 18 | # specific for native version |
19 | SRC_URI += " \ | 19 | SRC_URI += " \ |
20 | file://0008-Always-build-uic.patch \ | 20 | file://0006-Always-build-uic.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | do_install_append() { | 23 | do_install_append() { |
@@ -26,4 +26,4 @@ do_install_append() { | |||
26 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 26 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
27 | } | 27 | } |
28 | 28 | ||
29 | SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114" | 29 | SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 9bcfa791..4f019be9 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -11,15 +11,15 @@ SRC_URI += "\ | |||
11 | file://0002-Add-external-hostbindir-option.patch \ | 11 | file://0002-Add-external-hostbindir-option.patch \ |
12 | file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ | 12 | file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ |
13 | file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ | 13 | file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ |
14 | file://0001-Fix-missing-plugin_types.patch \ | 14 | file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ |
15 | file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ | 15 | file://0001-Revert-Use-the-gcc-feature-in-simd.prf.patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | # target specific | 18 | # target specific |
19 | SRC_URI += "\ | 19 | SRC_URI += "\ |
20 | file://0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ | 20 | file://0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ |
21 | file://0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ | 21 | file://0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ |
22 | file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ | 22 | file://0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114" | 25 | SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index c0fd15d8..52f2a2d3 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${BPN}.inc | 2 | require ${BPN}.inc |
3 | 3 | ||
4 | SRCREV = "6d9ab3981a1ae9e224b3c6a8cf107049a0ee5095" | 4 | SRCREV = "19f10aae3d333ef6486ea1390998f0674fd4d89e" |
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index bdb1de9d..ddc44c9f 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc | |||
@@ -2,7 +2,6 @@ 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 \ | ||
6 | " | 5 | " |
7 | 6 | ||
8 | # older copyright year than what e.g. qtbase is using now | 7 | # older copyright year than what e.g. qtbase is using now |
diff --git a/recipes-qt/qt5/qtdeclarative_5.3.0.bb b/recipes-qt/qt5/qtdeclarative_5.3.0.bb index 6725b576..7bd6bb44 100644 --- a/recipes-qt/qt5/qtdeclarative_5.3.0.bb +++ b/recipes-qt/qt5/qtdeclarative_5.3.0.bb | |||
@@ -1,5 +1,9 @@ | |||
1 | require qt5-${PV}.inc | 1 | require qt5-${PV}.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRC_URI += " \ | ||
5 | file://0002-Fix-improper-antialiasing-property-behavior.patch \ | ||
6 | " | ||
7 | |||
4 | SRC_URI[md5sum] = "9e29d2b481c771ce5c798a3319835673" | 8 | SRC_URI[md5sum] = "9e29d2b481c771ce5c798a3319835673" |
5 | SRC_URI[sha256sum] = "fab07eb4f4b2091e1d88b27b84ac49d7e8daaa1eb72fd62e602ee9ac3ed7f42f" | 9 | SRC_URI[sha256sum] = "fab07eb4f4b2091e1d88b27b84ac49d7e8daaa1eb72fd62e602ee9ac3ed7f42f" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 2d733a3f..318ba44b 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "aedcd57c84ac9d6b74816c13bdf3fde31e1132b5" | 4 | SRCREV = "67a101af142355a0ca7cdc234b7ee1716a25d87c" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 3960bd23..b7f2f79e 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb | |||
@@ -1,6 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | QT_MODULE_BRANCH = "release" | 4 | SRCREV = "07885f25ed57b98a695f28337fc4b91e611991aa" |
5 | # v1.0.4 | ||
6 | SRCREV = "bb55ab0eed452704e4ce52faf8e5337674c3b668" | ||
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 9347e7b3..a1e90094 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "9b1883d2e90dd6ef92374d21e490a3de1c8330ba" | 4 | SRCREV = "82abf6975b6737259ee656564e5ec7f8ad1d0508" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index b413a5f4..3e04c40a 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "554d617762c86964dfa074074304993ccdfbe2c9" | 4 | SRCREV = "bcc7909dfe9d89f793919bc96abdfd6b704c4c0e" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index bab82750..fcb69939 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "27c9ffe1d2eb2103e9b420c86c6fc3d10cb1ff76" | 4 | SRCREV = "749cdff5289412780f0bb8e351cb140ba64d85ce" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 88ca59ea..f0ce24ea 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "b088962950dbc4c6f0219de30b0d9a8cf47a3376" | 4 | SRCREV = "7e668fe58fc9546eb91bbf39992566f709b5e6c2" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 7c64460e..3400f472 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "c56f5d8848ce03cc6667804f815de47d2d8221fb" | 4 | SRCREV = "26e713cddcc8a62e49ce7a3352d3b5f13ffd7d52" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index fd525f14..bab6854f 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "ea9add905768a26ce86ab542615a193296642732" | 4 | SRCREV = "82a0a8244a2edf27c196f6c8cc3e2c36a3f4a8c5" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 2deaaff0..6d8fd313 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "e4453c92ee41943a3a1d67a725804a44e747f64e" | 4 | SRCREV = "161e1fd31537f41992b3024c32b525b64be080ed" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 6e3bda6e..c2ab0632 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "eee2eee734b4aa735d35f6c53d79c06c1c76425a" | 4 | SRCREV = "9efc5bea41e7acbce55c37b49b167092b71114a9" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 46192276..0755f450 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "6e75610dff5fb96ebd72cfb40ba7cbfea4bd21b7" | 4 | SRCREV = "04a3308346190a70509a759423993f6bcc365328" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 0aa79e19..6fc617da 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "ad81f5720c4f4a1dac099cbe2f9d47ed3a9025b0" | 4 | SRCREV = "35a2f0880831d38c60d2b4820dac808f48f6f3a8" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index 575616b2..9a31c139 100644 --- a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 90a2e92062fc67fa54be0f5596606ce2bc21f772 Mon Sep 17 00:00:00 2001 | 1 | From 50fdb63c074138f783a448bc2db97b6f0ccfefea 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 |
@@ -74,7 +74,7 @@ index 3a70580..a977878 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 861d06d..3438f9a 100644 | 77 | index a486d65..393eac2 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) { |
@@ -97,12 +97,12 @@ index 861d06d..3438f9a 100644 | |||
97 | } | 97 | } |
98 | 98 | ||
99 | SUBDIRS += linguist | 99 | SUBDIRS += linguist |
100 | -!android|android_app: SUBDIRS += qtpaths | 100 | -if(!android|android_app):!ios: SUBDIRS += qtpaths |
101 | +!linguistonly:!android|android_app: SUBDIRS += qtpaths | 101 | +if(!android|android_app):!linguistonly:!ios: SUBDIRS += qtpaths |
102 | 102 | ||
103 | mac { | 103 | mac { |
104 | SUBDIRS += macdeployqt | 104 | SUBDIRS += macdeployqt |
105 | @@ -25,7 +27,7 @@ android { | 105 | @@ -25,11 +27,11 @@ android { |
106 | SUBDIRS += androiddeployqt | 106 | SUBDIRS += androiddeployqt |
107 | } | 107 | } |
108 | 108 | ||
@@ -111,12 +111,11 @@ index 861d06d..3438f9a 100644 | |||
111 | 111 | ||
112 | win32|winrt:SUBDIRS += windeployqt | 112 | win32|winrt:SUBDIRS += windeployqt |
113 | winrt:SUBDIRS += winrtrunner qtd3dservice | 113 | winrt:SUBDIRS += winrtrunner qtd3dservice |
114 | @@ -36,4 +38,4 @@ qtNomakeTools( \ | 114 | -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag |
115 | macdeployqt \ | 115 | +!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag |
116 | ) | ||
117 | 116 | ||
118 | -!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag | 117 | qtNomakeTools( \ |
119 | +!linguistonly:!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag | 118 | pixeltool \ |
120 | diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro | 119 | diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro |
121 | index c3acfe3..b48e711 100644 | 120 | index c3acfe3..b48e711 100644 |
122 | --- a/tests/auto/auto.pro | 121 | --- a/tests/auto/auto.pro |
@@ -151,5 +150,5 @@ index c3acfe3..b48e711 100644 | |||
151 | installed_cmake.depends = cmake | 150 | installed_cmake.depends = cmake |
152 | 151 | ||
153 | -- | 152 | -- |
154 | 1.9.1 | 153 | 2.0.0 |
155 | 154 | ||
diff --git a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch index 1c404717..eaf46945 100644 --- a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch +++ b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 509541ebd648414ee33f3aea3035d1e6382bfa3c Mon Sep 17 00:00:00 2001 | 1 | From f375385c4795e3cd7df7aca2a4c769597164aaa8 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 | 3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 |
4 | Subject: [PATCH 2/2] assistant/help: fix linking of dependent libraries | 4 | Subject: [PATCH 2/2] assistant/help: fix linking of dependent libraries |
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 | |||
28 | + | 28 | + |
29 | +LIBS += -lQt5CLucene | 29 | +LIBS += -lQt5CLucene |
30 | -- | 30 | -- |
31 | 1.9.1 | 31 | 2.0.0 |
32 | 32 | ||
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb index 49a1907d..b37e0ed7 100644 --- a/recipes-qt/qt5/qttools-native_git.bb +++ b/recipes-qt/qt5/qttools-native_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f" | 4 | SRCREV = "eaf069902111533f0e675ab32279bb57a5916169" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 49a1907d..b37e0ed7 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f" | 4 | SRCREV = "eaf069902111533f0e675ab32279bb57a5916169" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 9fac8b23..9089f0fc 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb | |||
@@ -4,7 +4,7 @@ require ${PN}.inc | |||
4 | # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 | 4 | # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 |
5 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 | 5 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 |
6 | 6 | ||
7 | SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e" | 7 | SRCREV = "98dca3b54f52f08117c1e0d3a1b4826ed12ef23f" |
8 | 8 | ||
9 | # wayland-scanner and qtwaylandscanner must be in same path to work properly | 9 | # wayland-scanner and qtwaylandscanner must be in same path to work properly |
10 | do_install_append() { | 10 | do_install_append() { |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 3f18272a..ca068da7 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -4,7 +4,7 @@ require ${PN}.inc | |||
4 | # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 | 4 | # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 |
5 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 | 5 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 |
6 | 6 | ||
7 | SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb" | 7 | SRCREV = "98dca3b54f52f08117c1e0d3a1b4826ed12ef23f" |
8 | 8 | ||
9 | SRC_URI += " \ | 9 | SRC_URI += " \ |
10 | file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \ | 10 | file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \ |
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 98fdc2f0..f0ceb5df 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "c9d13139b65818785f218cc96d136d33591ca2f5" | 4 | SRCREV = "bce5056b9e16a943357e362455a46685d3f22093" |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index ec8b4f34..829dc77d 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "0546c8656a3728bf4375da39027e096beba4f111" | 4 | SRCREV = "a7ef31b64324fa43623e768a0798175884bd6e79" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 3528ae76..ff139865 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -1,6 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | QT_MODULE_BRANCH = "release" | 4 | SRCREV = "eb16b1970293dfeb5918751afbdf1fb7f62028e1" |
5 | # v5.3.0 | ||
6 | SRCREV = "c6dfdcdacfdd8c8190301b930caf67ad50ac09bb" | ||
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 954545f7..fdb80940 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "947361a7dc8db093d0b8e1ec5ac953470a180259" | 4 | SRCREV = "2d84caf5ef1b5dace0d678df4581db3c955be6ee" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index b86a749d..fb1846cd 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "d25091bb8b52455e415f8147a9100094c489a041" | 4 | SRCREV = "e13d30be68228ccda3b6310ac44a84981b17f03b" |
5 | 5 | ||
6 | # older copyright year than what e.g. qtbase is using now | 6 | # older copyright year than what e.g. qtbase is using now |
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |