diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-24 15:01:56 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-25 11:56:33 +0200 |
commit | 44d180c09346cb5b04636e19a41a7f0cc3b3c32e (patch) | |
tree | 1f1d8b4daf6b1f964df7c87207a77e13f2659c84 | |
parent | 40b7a93a3c6cf05136c606824c1cea848b75bcb6 (diff) | |
download | meta-qt5-44d180c09346cb5b04636e19a41a7f0cc3b3c32e.tar.gz |
qtbase: refresh patches
* based on b5.5.0 branches in https://github.com/meta-qt5/qtbase
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17 files changed, 74 insertions, 212 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 0b3e87df..28e6d09e 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -27,18 +27,18 @@ SRC_URI += "\ | |||
27 | file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ | 27 | file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ |
28 | file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ | 28 | file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ |
29 | file://0006-configure-bump-path-length-from-256-to-512-character.patch \ | 29 | file://0006-configure-bump-path-length-from-256-to-512-character.patch \ |
30 | file://0008-QOpenGLPaintDevice-sub-area-support.patch \ | 30 | file://0007-QOpenGLPaintDevice-sub-area-support.patch \ |
31 | " | 31 | " |
32 | 32 | ||
33 | # common for qtbase-native and nativesdk-qtbase | 33 | # common for qtbase-native and nativesdk-qtbase |
34 | SRC_URI += " \ | 34 | SRC_URI += " \ |
35 | file://0009-Always-build-uic.patch \ | 35 | file://0008-Always-build-uic.patch \ |
36 | file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ | 36 | file://0009-Add-external-hostbindir-option-for-native-sdk.patch \ |
37 | " | 37 | " |
38 | 38 | ||
39 | # specific for nativesdk-qtbase | 39 | # specific for nativesdk-qtbase |
40 | SRC_URI += " \ | 40 | SRC_URI += " \ |
41 | file://0009-configure-preserve-built-qmake-and-swap-with-native-.patch \ | 41 | file://0010-configure-preserve-built-qmake-and-swap-with-native-.patch \ |
42 | " | 42 | " |
43 | 43 | ||
44 | # CMake's toolchain configuration of nativesdk-qtbase | 44 | # CMake's toolchain configuration of nativesdk-qtbase |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index ebd72805..e449b019 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -23,13 +23,13 @@ SRC_URI += "\ | |||
23 | file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ | 23 | file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ |
24 | file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ | 24 | file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ |
25 | file://0006-configure-bump-path-length-from-256-to-512-character.patch \ | 25 | file://0006-configure-bump-path-length-from-256-to-512-character.patch \ |
26 | file://0008-QOpenGLPaintDevice-sub-area-support.patch \ | 26 | file://0007-QOpenGLPaintDevice-sub-area-support.patch \ |
27 | " | 27 | " |
28 | 28 | ||
29 | # common for qtbase-native and nativesdk-qtbase | 29 | # common for qtbase-native and nativesdk-qtbase |
30 | SRC_URI += " \ | 30 | SRC_URI += " \ |
31 | file://0009-Always-build-uic.patch \ | 31 | file://0008-Always-build-uic.patch \ |
32 | file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ | 32 | file://0009-Add-external-hostbindir-option-for-native-sdk.patch \ |
33 | " | 33 | " |
34 | 34 | ||
35 | CLEANBROKEN = "1" | 35 | CLEANBROKEN = "1" |
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 1997d0db..568d2a40 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b8b9732948ede2b27304eed7f1d78aed16a4eeb7 Mon Sep 17 00:00:00 2001 | 1 | From de9a457dacd9388e8ef145fce9cf4e1e1da6468b 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 1/7] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/10] 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 |
@@ -52,7 +52,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
52 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 52 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
53 | 53 | ||
54 | diff --git a/configure b/configure | 54 | diff --git a/configure b/configure |
55 | index 7251e8e..8093782 100755 | 55 | index 8a4c89e..dfbb111 100755 |
56 | --- a/configure | 56 | --- a/configure |
57 | +++ b/configure | 57 | +++ b/configure |
58 | @@ -342,6 +342,16 @@ getQMakeConf() | 58 | @@ -342,6 +342,16 @@ getQMakeConf() |
@@ -120,7 +120,7 @@ index 7251e8e..8093782 100755 | |||
120 | fi'` | 120 | fi'` |
121 | eval "$cmd" | 121 | eval "$cmd" |
122 | done | 122 | done |
123 | @@ -3335,7 +3345,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | 123 | @@ -3337,7 +3347,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then |
124 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no | 124 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no |
125 | fi | 125 | fi |
126 | 126 | ||
@@ -129,7 +129,7 @@ index 7251e8e..8093782 100755 | |||
129 | 129 | ||
130 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 130 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
131 | 131 | ||
132 | @@ -3392,7 +3402,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 132 | @@ -3394,7 +3404,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then |
133 | exit 1 | 133 | exit 1 |
134 | fi | 134 | fi |
135 | fi | 135 | fi |
@@ -138,7 +138,7 @@ index 7251e8e..8093782 100755 | |||
138 | 138 | ||
139 | GCC_MACHINE_DUMP= | 139 | GCC_MACHINE_DUMP= |
140 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac | 140 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac |
141 | @@ -3894,6 +3904,14 @@ setBootstrapVariable() | 141 | @@ -3896,6 +3906,14 @@ setBootstrapVariable() |
142 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" | 142 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" |
143 | } | 143 | } |
144 | 144 | ||
@@ -153,7 +153,7 @@ index 7251e8e..8093782 100755 | |||
153 | # build qmake | 153 | # build qmake |
154 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 154 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
155 | echo "Creating qmake..." | 155 | echo "Creating qmake..." |
156 | @@ -3932,14 +3950,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 156 | @@ -3934,14 +3952,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
157 | fi | 157 | fi |
158 | 158 | ||
159 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= | 159 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= |
@@ -348,5 +348,5 @@ index 0000000..dd12003 | |||
348 | + | 348 | + |
349 | +#endif // QPLATFORMDEFS_H | 349 | +#endif // QPLATFORMDEFS_H |
350 | -- | 350 | -- |
351 | 2.4.2 | 351 | 2.5.0 |
352 | 352 | ||
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 93571abd..57275176 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From c8d9a59b03bf53838118f0ddf599d554a4fcf4c6 Mon Sep 17 00:00:00 2001 | 1 | From 7ca620bb9f03ddc8536ac3c45b485cc83603f1c8 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 2/7] qlibraryinfo: allow to set qt.conf from the outside using | 4 | Subject: [PATCH 02/10] qlibraryinfo: allow to set qt.conf from the outside |
5 | the environment | 5 | using 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 2912e68..f663c88 100644 | |||
35 | return new QSettings(qtconfig, QSettings::IniFormat); | 35 | return new QSettings(qtconfig, QSettings::IniFormat); |
36 | #ifdef QT_BUILD_QMAKE | 36 | #ifdef QT_BUILD_QMAKE |
37 | -- | 37 | -- |
38 | 2.4.2 | 38 | 2.5.0 |
39 | 39 | ||
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index 4a8cdbbd..c44611d5 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d2212dd3c5acf7d3541f19470e688095a20d956c Mon Sep 17 00:00:00 2001 | 1 | From 0ac23b38794bd4580428e11b2cf1c88eb7f410f3 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: Add -external-hostbindir option | 4 | Subject: [PATCH 03/10] 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 |
@@ -37,7 +37,7 @@ Conflicts: | |||
37 | 7 files changed, 37 insertions(+), 12 deletions(-) | 37 | 7 files changed, 37 insertions(+), 12 deletions(-) |
38 | 38 | ||
39 | diff --git a/configure b/configure | 39 | diff --git a/configure b/configure |
40 | index 43c4dab..ffb69df 100755 | 40 | index dfbb111..548dd0d 100755 |
41 | --- a/configure | 41 | --- a/configure |
42 | +++ b/configure | 42 | +++ b/configure |
43 | @@ -806,6 +806,7 @@ QT_HOST_BINS= | 43 | @@ -806,6 +806,7 @@ QT_HOST_BINS= |
@@ -77,7 +77,7 @@ index 43c4dab..ffb69df 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 | @@ -3095,6 +3104,11 @@ fi | 80 | @@ -3097,6 +3106,11 @@ fi |
81 | # command line and environment validation | 81 | # command line and environment validation |
82 | #------------------------------------------------------------------------------- | 82 | #------------------------------------------------------------------------------- |
83 | 83 | ||
@@ -125,7 +125,7 @@ index 1d3e88c..9b26adf 100644 | |||
125 | 125 | ||
126 | !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) | 126 | !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) |
127 | diff --git a/qtbase.pro b/qtbase.pro | 127 | diff --git a/qtbase.pro b/qtbase.pro |
128 | index 51e8fb8..9806769 100644 | 128 | index 24d0f52..d3d79b3 100644 |
129 | --- a/qtbase.pro | 129 | --- a/qtbase.pro |
130 | +++ b/qtbase.pro | 130 | +++ b/qtbase.pro |
131 | @@ -37,12 +37,16 @@ CONFIG -= qt | 131 | @@ -37,12 +37,16 @@ CONFIG -= qt |
@@ -148,7 +148,7 @@ index 51e8fb8..9806769 100644 | |||
148 | } | 148 | } |
149 | INSTALLS += qmake | 149 | INSTALLS += qmake |
150 | 150 | ||
151 | @@ -54,6 +58,9 @@ exists($$licheck.files): INSTALLS += licheck | 151 | @@ -54,6 +58,9 @@ licheck.files = $$PWD/bin/$$QT_LICHECK |
152 | #syncqt | 152 | #syncqt |
153 | syncqt.path = $$[QT_HOST_BINS] | 153 | syncqt.path = $$[QT_HOST_BINS] |
154 | syncqt.files = $$PWD/bin/syncqt.pl | 154 | syncqt.files = $$PWD/bin/syncqt.pl |
@@ -159,7 +159,7 @@ index 51e8fb8..9806769 100644 | |||
159 | 159 | ||
160 | # If we are doing a prefix build, create a "module" pri which enables | 160 | # If we are doing a prefix build, create a "module" pri which enables |
161 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in | 161 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in |
162 | index 48d5f21..6482022 100644 | 162 | index 65fd1f9..457518b 100644 |
163 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in | 163 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in |
164 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in | 164 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in |
165 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) | 165 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) |
@@ -225,5 +225,5 @@ index 99d87e2..5621dc0 100644 | |||
225 | _qt5_Widgets_check_file_exists(${imported_location}) | 225 | _qt5_Widgets_check_file_exists(${imported_location}) |
226 | 226 | ||
227 | -- | 227 | -- |
228 | 2.2.2 | 228 | 2.5.0 |
229 | 229 | ||
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index 4bc6fdd8..aef49995 100644 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 3b289cf76a5ce78d94ee022af7d92152f5875372 Mon Sep 17 00:00:00 2001 | 1 | From bae1b8fbd3fe94a99a02fb751302baa788e9f2ff 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 3/7] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH 04/10] qt_module: Fix pkgconfig and libtool replacements |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -108,5 +108,5 @@ index 5412f37..5ab348a 100644 | |||
108 | } | 108 | } |
109 | 109 | ||
110 | -- | 110 | -- |
111 | 2.4.2 | 111 | 2.5.0 |
112 | 112 | ||
diff --git a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 8d1ed4ea..fbddae3b 100644 --- a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 232e2913168fd150bab4071bd57f8fef8d431eb4 Mon Sep 17 00:00:00 2001 | 1 | From 0b4d9044218df6e7fb700be6cfd21b4aaab24b18 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 4/7] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 05/10] 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 42fbf8c..8950f2d 100644 | |||
26 | 26 | ||
27 | class QEGLPlatformWindow; | 27 | class QEGLPlatformWindow; |
28 | -- | 28 | -- |
29 | 2.4.2 | 29 | 2.5.0 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch index 0a6b92d4..91b13534 100644 --- a/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7b080f568fac5001f272a11f56968a3c65793077 Mon Sep 17 00:00:00 2001 | 1 | From fc3819b1f69278e9d66095d1faf33ae0e5a70eb6 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 5/7] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 06/10] 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 8093782..43c4dab 100755 | 15 | index 548dd0d..b8f1fb9 100755 |
16 | --- a/configure | 16 | --- a/configure |
17 | +++ b/configure | 17 | +++ b/configure |
18 | @@ -3834,7 +3834,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ | 18 | @@ -3850,7 +3850,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ |
19 | static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; | 19 | static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; |
20 | 20 | ||
21 | /* Installation Info */ | 21 | /* Installation Info */ |
@@ -25,5 +25,5 @@ index 8093782..43c4dab 100755 | |||
25 | static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; | 25 | static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; |
26 | static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX"; | 26 | static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX"; |
27 | -- | 27 | -- |
28 | 2.4.2 | 28 | 2.5.0 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtbase/0008-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch index c6cbaf69..eb2fd5a8 100644 --- a/recipes-qt/qt5/qtbase/0008-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From fbcda470b5b64ab49a7a4c647e19bda623ce95b7 Mon Sep 17 00:00:00 2001 | 1 | From 7dfc673d6968ce890e5fad7fd8fd8a74c12b876b 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 7/7] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 07/10] QOpenGLPaintDevice sub-area support |
5 | 5 | ||
6 | Allows creating QOpenGLPaintDevice targetting sub-area | 6 | Allows creating QOpenGLPaintDevice targetting sub-area |
7 | of binded framebuffer. | 7 | of binded framebuffer. |
@@ -153,5 +153,5 @@ index c179143..fad68d5 100644 | |||
153 | } else { | 153 | } else { |
154 | if (m_vao.isCreated()) { | 154 | if (m_vao.isCreated()) { |
155 | -- | 155 | -- |
156 | 2.4.2 | 156 | 2.5.0 |
157 | 157 | ||
diff --git a/recipes-qt/qt5/qtbase/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch deleted file mode 100644 index dabbc1c3..00000000 --- a/recipes-qt/qt5/qtbase/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | From 30d26b494bd5b77be6c4e4b41d8df7af5487ee4b Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Wed, 5 Feb 2014 18:35:08 +0100 | ||
4 | Subject: [PATCH 6/7] eglfs: fix egl error for platforms only supporting one | ||
5 | window/surface | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | running qmlscene -platform eglfs <filename>.qml | ||
11 | |||
12 | caused | ||
13 | |||
14 | EGL Error : Could not create the egl surface: error = 0x3003 | ||
15 | |||
16 | Rebased version of [1-2] | ||
17 | |||
18 | Upstream-Status: unknown | ||
19 | |||
20 | [1] http://repository.timesys.com/buildsources/q/qt-everywhere-opensource/qt-everywhere-opensource-5.1.1/qt-everywhere-opensource-5.1.1-qeglfswindow.cpp.patch | ||
21 | [2] https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/qeglfswindow.cpp.patch | ||
22 | |||
23 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
24 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
25 | --- | ||
26 | src/plugins/platforms/eglfs/qeglfswindow.cpp | 16 +++++++++++++++- | ||
27 | 1 file changed, 15 insertions(+), 1 deletion(-) | ||
28 | |||
29 | diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp | ||
30 | index c0d51c9..bb4dc00 100644 | ||
31 | --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp | ||
32 | +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp | ||
33 | @@ -69,6 +69,15 @@ void QEglFSWindow::create() | ||
34 | |||
35 | m_flags = Created; | ||
36 | |||
37 | + static EGLSurface __singleWindowSurface; | ||
38 | + if(QEglFSHooks::hooks() && ! QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows) && (__singleWindowSurface)) { | ||
39 | + m_surface = __singleWindowSurface; | ||
40 | +#ifdef QEGL_EXTRA_DEBUG | ||
41 | + qWarning("Surface recreate request, re-using %x\n", m_surface); | ||
42 | +#endif | ||
43 | + return; | ||
44 | + } | ||
45 | + | ||
46 | if (window()->type() == Qt::Desktop) | ||
47 | return; | ||
48 | |||
49 | @@ -83,7 +92,7 @@ void QEglFSWindow::create() | ||
50 | return; | ||
51 | } | ||
52 | |||
53 | -#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) | ||
54 | +#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB) | ||
55 | // We can have either a single OpenGL window or multiple raster windows. | ||
56 | // Other combinations cannot work. | ||
57 | qFatal("EGLFS: OpenGL windows cannot be mixed with others."); | ||
58 | @@ -103,6 +112,11 @@ void QEglFSWindow::create() | ||
59 | |||
60 | resetSurface(); | ||
61 | |||
62 | + if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows)) | ||
63 | + { | ||
64 | + __singleWindowSurface = m_surface; | ||
65 | + } | ||
66 | + | ||
67 | screen->setPrimarySurface(m_surface); | ||
68 | |||
69 | if (isRaster()) { | ||
70 | -- | ||
71 | 2.4.2 | ||
72 | |||
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch index dc802a78..11e1bcb7 100644 --- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 8fb793a4a8e715f0c418df9ab17e39d103d59d3d Mon Sep 17 00:00:00 2001 | 1 | From 7159760b75cc338faee3e95d26d3aea377473681 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 8/9] Always build uic | 4 | Subject: [PATCH 08/10] 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 b4d62aa..5e19215 100644 | |||
27 | nacl: SUBDIRS -= src_network src_testlib | 27 | nacl: SUBDIRS -= src_network src_testlib |
28 | 28 | ||
29 | -- | 29 | -- |
30 | 2.4.2 | 30 | 2.5.0 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtbase/0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index f5f2a23a..ef8fcb2a 100644 --- a/recipes-qt/qt5/qtbase/0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From 51e7ea78d15a590f42154f19486f10d2019401e3 Mon Sep 17 00:00:00 2001 | 1 | From 890df28110c254022682b38f78bbbea1d62b8081 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 11/12] qmake: don't build it in configure, but allow to build | 4 | Subject: [PATCH 8/9] 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 |
@@ -25,10 +25,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
25 | 3 files changed, 4 insertions(+), 2 deletions(-) | 25 | 3 files changed, 4 insertions(+), 2 deletions(-) |
26 | 26 | ||
27 | diff --git a/configure b/configure | 27 | diff --git a/configure b/configure |
28 | index c19ff6a..7a34b11 100755 | 28 | index b8f1fb9..c72b8ee 100755 |
29 | --- a/configure | 29 | --- a/configure |
30 | +++ b/configure | 30 | +++ b/configure |
31 | @@ -3729,7 +3729,7 @@ setBootstrapEvalVariable() | 31 | @@ -3929,7 +3929,7 @@ setBootstrapEvalVariable() |
32 | 32 | ||
33 | 33 | ||
34 | # build qmake | 34 | # build qmake |
@@ -38,10 +38,10 @@ index c19ff6a..7a34b11 100755 | |||
38 | 38 | ||
39 | mkdir -p "$outpath/qmake" || exit | 39 | mkdir -p "$outpath/qmake" || exit |
40 | diff --git a/qmake/qmake.pri b/qmake/qmake.pri | 40 | diff --git a/qmake/qmake.pri b/qmake/qmake.pri |
41 | index 4de41d6..69982b7 100644 | 41 | index 782151d..4b314a8 100644 |
42 | --- a/qmake/qmake.pri | 42 | --- a/qmake/qmake.pri |
43 | +++ b/qmake/qmake.pri | 43 | +++ b/qmake/qmake.pri |
44 | @@ -82,7 +82,8 @@ bootstrap { #Qt code | 44 | @@ -80,7 +80,8 @@ bootstrap { #Qt code |
45 | qjsonparser.cpp \ | 45 | qjsonparser.cpp \ |
46 | qjsonarray.cpp \ | 46 | qjsonarray.cpp \ |
47 | qjsonobject.cpp \ | 47 | qjsonobject.cpp \ |
@@ -64,5 +64,5 @@ index 89d6ea5..0ff4a96 100644 | |||
64 | VPATH += \ | 64 | VPATH += \ |
65 | ../src/corelib/global \ | 65 | ../src/corelib/global \ |
66 | -- | 66 | -- |
67 | 2.4.2 | 67 | 2.5.0 |
68 | 68 | ||
diff --git a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch index 546e954b..59b67289 100644 --- a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 45bdf5ff770fe17634f216c3f533645bfd450f04 Mon Sep 17 00:00:00 2001 | 1 | From a48e2ad5bef673e9d345d5d6de94e5bbda53fa2b 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 9/9] Add -external-hostbindir option for native(sdk) | 4 | Subject: [PATCH 09/10] Add -external-hostbindir option for native(sdk) |
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 |
@@ -29,17 +29,18 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
29 | Conflicts: | 29 | Conflicts: |
30 | tools/configure/configureapp.cpp | 30 | tools/configure/configureapp.cpp |
31 | --- | 31 | --- |
32 | configure | 1 + | ||
32 | qmake/property.cpp | 1 + | 33 | qmake/property.cpp | 1 + |
33 | src/corelib/global/qlibraryinfo.cpp | 3 ++- | 34 | src/corelib/global/qlibraryinfo.cpp | 3 ++- |
34 | src/corelib/global/qlibraryinfo.h | 1 + | 35 | src/corelib/global/qlibraryinfo.h | 1 + |
35 | tools/configure/configureapp.cpp | 11 +++++++++++ | 36 | tools/configure/configureapp.cpp | 11 +++++++++++ |
36 | 4 files changed, 15 insertions(+), 1 deletion(-) | 37 | 5 files changed, 16 insertions(+), 1 deletion(-) |
37 | 38 | ||
38 | diff --git a/configure b/configure | 39 | diff --git a/configure b/configure |
39 | index ffb69df..aa46774 100755 | 40 | index b8f1fb9..1d2157f 100755 |
40 | --- a/configure | 41 | --- a/configure |
41 | +++ b/configure | 42 | +++ b/configure |
42 | @@ -3831,6 +3831,7 @@ addConfStr "$CFG_SYSROOT" | 43 | @@ -3833,6 +3833,7 @@ addConfStr "$CFG_SYSROOT" |
43 | addConfStr "$QT_REL_HOST_BINS" | 44 | addConfStr "$QT_REL_HOST_BINS" |
44 | addConfStr "$QT_REL_HOST_LIBS" | 45 | addConfStr "$QT_REL_HOST_LIBS" |
45 | addConfStr "$QT_REL_HOST_DATA" | 46 | addConfStr "$QT_REL_HOST_DATA" |
@@ -128,3 +129,6 @@ index 3bf0546..53bf146 100644 | |||
128 | addConfStr(1, targSpec); | 129 | addConfStr(1, targSpec); |
129 | addConfStr(1, hostSpec); | 130 | addConfStr(1, hostSpec); |
130 | 131 | ||
132 | -- | ||
133 | 2.5.0 | ||
134 | |||
diff --git a/recipes-qt/qt5/qtbase/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch index dee8b350..3be238b6 100644 --- a/recipes-qt/qt5/qtbase/0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch +++ b/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 8f09897de948cea8861ca95e182f442cf15a339e Mon Sep 17 00:00:00 2001 | 1 | From 168bf7753c648e7599ab9967501e74373037f5e9 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 8 Jun 2015 13:59:25 -0700 | 3 | Date: Mon, 8 Jun 2015 13:59:25 -0700 |
4 | Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T | 4 | Subject: [PATCH 9/9] linux-oe-g++: Invert conditional for defining |
5 | QT_SOCKLEN_T | ||
5 | 6 | ||
6 | This helps to make sure that QT_SOCKLEN_T is defined to be 'int' | 7 | This helps to make sure that QT_SOCKLEN_T is defined to be 'int' |
7 | only when its glibc < 2 and not also for the libraries which may define | 8 | only when its glibc < 2 and not also for the libraries which may define |
@@ -31,5 +32,5 @@ index dd12003..8623651 100644 | |||
31 | 32 | ||
32 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) | 33 | #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) |
33 | -- | 34 | -- |
34 | 2.1.4 | 35 | 2.5.0 |
35 | 36 | ||
diff --git a/recipes-qt/qt5/qtbase/0009-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch index 4cc9bf0e..109c7d18 100644 --- a/recipes-qt/qt5/qtbase/0009-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From abbd6ce89977ff1854c7eb6a5864568ee81a6ccd Mon Sep 17 00:00:00 2001 | 1 | From ee09941be5f00409029497b65358f8b8d3db91de 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 9/9] configure: preserve built qmake and swap with native one | 4 | Subject: [PATCH 10/10] configure: preserve built qmake and swap with native |
5 | one | ||
5 | 6 | ||
6 | Let configure script build the real qmake, but right after it's built, swap | 7 | Let configure script build the real qmake, but right after it's built, swap |
7 | it with a native qmake for further internal use, preserving the real one. | 8 | it with a native qmake for further internal use, preserving the real one. |
@@ -12,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
12 | 1 file changed, 2 insertions(+) | 13 | 1 file changed, 2 insertions(+) |
13 | 14 | ||
14 | diff --git a/configure b/configure | 15 | diff --git a/configure b/configure |
15 | index 43c4dab..69e6f46 100755 | 16 | index 1d2157f..bea14af 100755 |
16 | --- a/configure | 17 | --- a/configure |
17 | +++ b/configure | 18 | +++ b/configure |
18 | @@ -4082,6 +4082,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 19 | @@ -4099,6 +4099,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
19 | echo "Done." | 20 | echo "Done." |
20 | fi | 21 | fi |
21 | fi # Build qmake | 22 | fi # Build qmake |
@@ -25,5 +26,5 @@ index 43c4dab..69e6f46 100755 | |||
25 | echo "Running configuration tests..." | 26 | echo "Running configuration tests..." |
26 | 27 | ||
27 | -- | 28 | -- |
28 | 2.4.2 | 29 | 2.5.0 |
29 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch b/recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch deleted file mode 100644 index cb1005c9..00000000 --- a/recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | From 4dd60bf7b9db89fad8154168e71581ed648cf356 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Thu, 22 Jan 2015 16:09:35 +0100 | ||
4 | Subject: [PATCH 12/12] Set paths for target properly | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | --- | ||
13 | configure | 43 +++++++++++++++++++++---------------------- | ||
14 | 1 file changed, 21 insertions(+), 22 deletions(-) | ||
15 | |||
16 | diff --git a/configure b/configure | ||
17 | index 7a34b11..7bb4476 100755 | ||
18 | --- a/configure | ||
19 | +++ b/configure | ||
20 | @@ -3644,28 +3644,27 @@ static const char qt_configure_prefix_path_strs[][512 + 12] = { | ||
21 | "qt_xmplpath=$QT_SYSROOT_EXAMPLES", | ||
22 | "qt_tstspath=$QT_SYSROOT_TESTS", | ||
23 | #else | ||
24 | - "qt_prfxpath=$QT_INSTALL_PREFIX", | ||
25 | - "qt_docspath=$QT_INSTALL_DOCS", | ||
26 | - "qt_hdrspath=$QT_INSTALL_HEADERS", | ||
27 | - "qt_libspath=$QT_INSTALL_LIBS", | ||
28 | - "qt_lbexpath=$QT_INSTALL_LIBEXECS", | ||
29 | - "qt_binspath=$QT_INSTALL_BINS", | ||
30 | - "qt_plugpath=$QT_INSTALL_PLUGINS", | ||
31 | - "qt_impspath=$QT_INSTALL_IMPORTS", | ||
32 | - "qt_qml2path=$QT_INSTALL_QML", | ||
33 | - "qt_adatpath=$QT_INSTALL_ARCHDATA", | ||
34 | - "qt_datapath=$QT_INSTALL_DATA", | ||
35 | - "qt_trnspath=$QT_INSTALL_TRANSLATIONS", | ||
36 | - "qt_xmplpath=$QT_INSTALL_EXAMPLES", | ||
37 | - "qt_tstspath=$QT_INSTALL_TESTS", | ||
38 | - "qt_ssrtpath=$CFG_SYSROOT", | ||
39 | - "qt_hpfxpath=$QT_HOST_PREFIX", | ||
40 | - "qt_hbinpath=$QT_HOST_BINS", | ||
41 | - "qt_hlibpath=$QT_HOST_LIBS", | ||
42 | - "qt_hdatpath=$QT_HOST_DATA", | ||
43 | - "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", | ||
44 | - "qt_targspec=$shortxspec", | ||
45 | - "qt_hostspec=$shortspec", | ||
46 | + "qt_prfxpath=$QT_SYSROOT_PREFIX", | ||
47 | + "qt_docspath=$QT_SYSROOT_DOCS", | ||
48 | + "qt_hdrspath=$QT_SYSROOT_HEADERS", | ||
49 | + "qt_libspath=$QT_SYSROOT_LIBS", | ||
50 | + "qt_lbexpath=$QT_SYSROOT_LIBEXECS", | ||
51 | + "qt_binspath=$QT_SYSROOT_BINS", | ||
52 | + "qt_plugpath=$QT_SYSROOT_PLUGINS", | ||
53 | + "qt_impspath=$QT_SYSROOT_IMPORTS", | ||
54 | + "qt_qml2path=$QT_SYSROOT_QML", | ||
55 | + "qt_adatpath=$QT_SYSROOT_ARCHDATA", | ||
56 | + "qt_datapath=$QT_SYSROOT_DATA", | ||
57 | + "qt_trnspath=$QT_SYSROOT_TRANSLATIONS", | ||
58 | + "qt_xmplpath=$QT_SYSROOT_EXAMPLES", | ||
59 | + "qt_tstspath=$QT_SYSROOT_TESTS", | ||
60 | + "qt_ssrtpath=", | ||
61 | + "qt_hpfxpath=$QT_SYSROOT_PREFIX", | ||
62 | + "qt_hbinpath=$QT_SYSROOT_BINS", | ||
63 | + "qt_hlibpath=$QT_SYSROOT_LIBS", | ||
64 | + "qt_hdatpath=$QT_SYSROOT_LIBS/qt5", | ||
65 | + "qt_targspec=linux-g++", | ||
66 | + "qt_hostspec=linux-g++", | ||
67 | #endif | ||
68 | }; | ||
69 | static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; | ||
70 | -- | ||
71 | 2.4.2 | ||
72 | |||
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index f472c988..02445f83 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -17,13 +17,13 @@ SRC_URI += "\ | |||
17 | file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ | 17 | file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ |
18 | file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ | 18 | file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ |
19 | file://0006-configure-bump-path-length-from-256-to-512-character.patch \ | 19 | file://0006-configure-bump-path-length-from-256-to-512-character.patch \ |
20 | file://0008-QOpenGLPaintDevice-sub-area-support.patch \ | 20 | file://0007-QOpenGLPaintDevice-sub-area-support.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | # specific for target qtbase | 23 | # specific for target qtbase |
24 | SRC_URI += "\ | 24 | SRC_URI += "\ |
25 | file://0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ | 25 | file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ |
26 | file://0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ | 26 | file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ |
27 | " | 27 | " |
28 | 28 | ||
29 | DEPENDS += "qtbase-native" | 29 | DEPENDS += "qtbase-native" |