diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git')
15 files changed, 55 insertions, 55 deletions
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 1455c6b5..a1ce9f2f 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,4 +1,4 @@ | |||
1 | From cfab0821397f5c41e123590b388c6f9c6834b1be Mon Sep 17 00:00:00 2001 | 1 | From e04fdddaeb59006c2d599b8b261ce714341029ba 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/12] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/12] Add linux-oe-g++ platform |
@@ -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 043d9fc..12fe2f0 100755 | 55 | index 6ce6753..0a00d6d 100755 |
56 | --- a/configure | 56 | --- a/configure |
57 | +++ b/configure | 57 | +++ b/configure |
58 | @@ -316,6 +316,16 @@ getQMakeConf() | 58 | @@ -316,6 +316,16 @@ getQMakeConf() |
@@ -119,7 +119,7 @@ index 043d9fc..12fe2f0 100755 | |||
119 | # Use CC/CXX to run config.tests | 119 | # Use CC/CXX to run config.tests |
120 | mkdir -p "$outpath/config.tests" | 120 | mkdir -p "$outpath/config.tests" |
121 | rm -f "$outpath/config.tests/.qmake.cache" | 121 | rm -f "$outpath/config.tests/.qmake.cache" |
122 | @@ -3173,7 +3191,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | 122 | @@ -3178,7 +3196,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then |
123 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no | 123 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no |
124 | fi | 124 | fi |
125 | 125 | ||
@@ -128,7 +128,7 @@ index 043d9fc..12fe2f0 100755 | |||
128 | 128 | ||
129 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 129 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
130 | 130 | ||
131 | @@ -3211,7 +3229,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 131 | @@ -3216,7 +3234,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then |
132 | exit 1 | 132 | exit 1 |
133 | fi | 133 | fi |
134 | fi | 134 | fi |
@@ -137,7 +137,7 @@ index 043d9fc..12fe2f0 100755 | |||
137 | 137 | ||
138 | GCC_MACHINE_DUMP= | 138 | GCC_MACHINE_DUMP= |
139 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac | 139 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac |
140 | @@ -3682,6 +3700,14 @@ setBootstrapVariable() | 140 | @@ -3687,6 +3705,14 @@ setBootstrapVariable() |
141 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" | 141 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" |
142 | } | 142 | } |
143 | 143 | ||
@@ -152,7 +152,7 @@ index 043d9fc..12fe2f0 100755 | |||
152 | # build qmake | 152 | # build qmake |
153 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 153 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
154 | echo "Creating qmake..." | 154 | echo "Creating qmake..." |
155 | @@ -3720,14 +3746,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 155 | @@ -3725,14 +3751,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
156 | fi | 156 | fi |
157 | 157 | ||
158 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= | 158 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= |
@@ -347,5 +347,5 @@ index 0000000..dd12003 | |||
347 | + | 347 | + |
348 | +#endif // QPLATFORMDEFS_H | 348 | +#endif // QPLATFORMDEFS_H |
349 | -- | 349 | -- |
350 | 2.3.0 | 350 | 2.3.1 |
351 | 351 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 127eada2..306af7f5 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 060ea3b14cdf9c9224867d114344a4034edfd30f Mon Sep 17 00:00:00 2001 | 1 | From 182e7a96a99e9bcabcbd8858c377035a47e4e3e8 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 02/12] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside |
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
19 | 1 file changed, 4 insertions(+), 1 deletion(-) | 19 | 1 file changed, 4 insertions(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 21 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
22 | index d592032..c418c5e 100644 | 22 | index d66007b..91ca643 100644 |
23 | --- a/src/corelib/global/qlibraryinfo.cpp | 23 | --- a/src/corelib/global/qlibraryinfo.cpp |
24 | +++ b/src/corelib/global/qlibraryinfo.cpp | 24 | +++ b/src/corelib/global/qlibraryinfo.cpp |
25 | @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() | 25 | @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() |
@@ -35,5 +35,5 @@ index d592032..c418c5e 100644 | |||
35 | if(!QFile::exists(qtconfig)) | 35 | if(!QFile::exists(qtconfig)) |
36 | qtconfig = qt_libraryInfoFile(); | 36 | qtconfig = qt_libraryInfoFile(); |
37 | -- | 37 | -- |
38 | 2.3.0 | 38 | 2.3.1 |
39 | 39 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch index 2957c4fd..4451751d 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4efa6ef7025ebd03379d76a419c118189e8e9d4e Mon Sep 17 00:00:00 2001 | 1 | From 457efc32bb79060a0a58a82ff8a35d67655ef6d6 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 03/12] Add -external-hostbindir option | 4 | Subject: [PATCH 03/12] Add -external-hostbindir option |
@@ -34,10 +34,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
34 | 7 files changed, 38 insertions(+), 12 deletions(-) | 34 | 7 files changed, 38 insertions(+), 12 deletions(-) |
35 | 35 | ||
36 | diff --git a/configure b/configure | 36 | diff --git a/configure b/configure |
37 | index 12fe2f0..7ac81d8 100755 | 37 | index 0a00d6d..ad5f4cd 100755 |
38 | --- a/configure | 38 | --- a/configure |
39 | +++ b/configure | 39 | +++ b/configure |
40 | @@ -769,6 +769,7 @@ QT_HOST_BINS= | 40 | @@ -770,6 +770,7 @@ QT_HOST_BINS= |
41 | QT_HOST_LIBS= | 41 | QT_HOST_LIBS= |
42 | QT_HOST_DATA= | 42 | QT_HOST_DATA= |
43 | QT_EXT_PREFIX= | 43 | QT_EXT_PREFIX= |
@@ -45,7 +45,7 @@ index 12fe2f0..7ac81d8 100755 | |||
45 | 45 | ||
46 | #flags for SQL drivers | 46 | #flags for SQL drivers |
47 | QT_CFLAGS_PSQL= | 47 | QT_CFLAGS_PSQL= |
48 | @@ -888,6 +889,7 @@ while [ "$#" -gt 0 ]; do | 48 | @@ -889,6 +890,7 @@ while [ "$#" -gt 0 ]; do |
49 | -testsdir| \ | 49 | -testsdir| \ |
50 | -hostdatadir| \ | 50 | -hostdatadir| \ |
51 | -hostbindir| \ | 51 | -hostbindir| \ |
@@ -53,7 +53,7 @@ index 12fe2f0..7ac81d8 100755 | |||
53 | -hostlibdir| \ | 53 | -hostlibdir| \ |
54 | -extprefix| \ | 54 | -extprefix| \ |
55 | -sysroot| \ | 55 | -sysroot| \ |
56 | @@ -1102,6 +1104,9 @@ while [ "$#" -gt 0 ]; do | 56 | @@ -1107,6 +1109,9 @@ while [ "$#" -gt 0 ]; do |
57 | extprefix) | 57 | extprefix) |
58 | QT_EXT_PREFIX="$VAL" | 58 | QT_EXT_PREFIX="$VAL" |
59 | ;; | 59 | ;; |
@@ -63,7 +63,7 @@ index 12fe2f0..7ac81d8 100755 | |||
63 | pkg-config) | 63 | pkg-config) |
64 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 64 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
65 | CFG_PKGCONFIG="$VAL" | 65 | CFG_PKGCONFIG="$VAL" |
66 | @@ -2265,6 +2270,10 @@ Installation options: | 66 | @@ -2270,6 +2275,10 @@ Installation options: |
67 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> | 67 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> |
68 | (default HOSTPREFIX) | 68 | (default HOSTPREFIX) |
69 | 69 | ||
@@ -74,7 +74,7 @@ index 12fe2f0..7ac81d8 100755 | |||
74 | Configure options: | 74 | Configure options: |
75 | 75 | ||
76 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 76 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
77 | @@ -2944,6 +2953,11 @@ fi | 77 | @@ -2949,6 +2958,11 @@ fi |
78 | # command line and environment validation | 78 | # command line and environment validation |
79 | #------------------------------------------------------------------------------- | 79 | #------------------------------------------------------------------------------- |
80 | 80 | ||
@@ -86,7 +86,7 @@ index 12fe2f0..7ac81d8 100755 | |||
86 | # update QT_CONFIG to show our current predefined configuration | 86 | # update QT_CONFIG to show our current predefined configuration |
87 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h | 87 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h |
88 | case "$CFG_QCONFIG" in | 88 | case "$CFG_QCONFIG" in |
89 | @@ -3644,6 +3658,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { | 89 | @@ -3649,6 +3663,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { |
90 | "qt_hbinpath=$QT_HOST_BINS", | 90 | "qt_hbinpath=$QT_HOST_BINS", |
91 | "qt_hlibpath=$QT_HOST_LIBS", | 91 | "qt_hlibpath=$QT_HOST_LIBS", |
92 | "qt_hdatpath=$QT_HOST_DATA", | 92 | "qt_hdatpath=$QT_HOST_DATA", |
@@ -163,7 +163,7 @@ index 6d0de44..ddf7478 100644 | |||
163 | 163 | ||
164 | # If we are doing a prefix build, create a "module" pri which enables | 164 | # If we are doing a prefix build, create a "module" pri which enables |
165 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in | 165 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in |
166 | index 4387bed..6e1aa7a 100644 | 166 | index 7213a84..a977417 100644 |
167 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in | 167 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in |
168 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in | 168 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in |
169 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) | 169 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) |
@@ -229,5 +229,5 @@ index 99d87e2..5621dc0 100644 | |||
229 | _qt5_Widgets_check_file_exists(${imported_location}) | 229 | _qt5_Widgets_check_file_exists(${imported_location}) |
230 | 230 | ||
231 | -- | 231 | -- |
232 | 2.3.0 | 232 | 2.3.1 |
233 | 233 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index 8790ae65..20ddff94 100644 --- a/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From efd941d9d21a7f9a41dcabf7ea88481c3563ae93 Mon Sep 17 00:00:00 2001 | 1 | From 8c5554c1ee9a18548c166f6c3a7b487b9d3cdc3e 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 04/12] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH 04/12] qt_module: Fix pkgconfig and libtool replacements |
@@ -110,5 +110,5 @@ index d213f9e..915c596 100644 | |||
110 | } | 110 | } |
111 | 111 | ||
112 | -- | 112 | -- |
113 | 2.3.0 | 113 | 2.3.1 |
114 | 114 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0005-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 b7bb8c89..02dc13a6 100644 --- a/recipes-qt/qt5/qtbase-git/0005-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,4 +1,4 @@ | |||
1 | From 4d32129ba11c6b7d4cfd4d037e3e3b73fd32b6b5 Mon Sep 17 00:00:00 2001 | 1 | From 825043f0a657cd4b8c3af0e00c79684388460d5c 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 05/12] Revert "eglfs: Print the chosen config in debug mode" | 4 | Subject: [PATCH 05/12] Revert "eglfs: Print the chosen config in debug mode" |
@@ -93,5 +93,5 @@ index 7cc3300..ccbd974a 100644 | |||
93 | } | 93 | } |
94 | 94 | ||
95 | -- | 95 | -- |
96 | 2.3.0 | 96 | 2.3.1 |
97 | 97 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 386d2e87..251cdc6e 100644 --- a/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 29c6088243796faf0b4115a93239d4ada9182757 Mon Sep 17 00:00:00 2001 | 1 | From b4d4c91bb504c9e90b69a2d78453bf3523ec6822 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 06/12] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 06/12] qeglplatformintegration: Undefine CursorShape from X.h |
@@ -26,5 +26,5 @@ index 2b5d5f5..a0aab03 100644 | |||
26 | 26 | ||
27 | class QEGLPlatformScreen; | 27 | class QEGLPlatformScreen; |
28 | -- | 28 | -- |
29 | 2.3.0 | 29 | 2.3.1 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch index d6731d63..23bfa77f 100644 --- a/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9eadba2398bfba10209f25b1c2e0ceb04e04957c Mon Sep 17 00:00:00 2001 | 1 | From e4235e3a0ebe4494ad1f4f550ddb070100e530e1 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 07/12] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 07/12] configure: bump path length from 256 to 512 characters |
@@ -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 7ac81d8..8b42b8e 100755 | 15 | index ad5f4cd..c19ff6a 100755 |
16 | --- a/configure | 16 | --- a/configure |
17 | +++ b/configure | 17 | +++ b/configure |
18 | @@ -3622,7 +3622,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ | 18 | @@ -3627,7 +3627,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 7ac81d8..8b42b8e 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 | 2.3.0 | 28 | 2.3.1 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch index 650dd9dd..e7e50844 100644 --- a/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ b/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b6776c9f0da5988013d5195592b84e313b79daab Mon Sep 17 00:00:00 2001 | 1 | From 715b5d739b36588cd2e34962b33a59da1f5427fe 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 08/12] eglfs: fix egl error for platforms only supporting one | 4 | Subject: [PATCH 08/12] eglfs: fix egl error for platforms only supporting one |
@@ -68,5 +68,5 @@ index 39a3ef9..2c05979 100644 | |||
68 | 68 | ||
69 | if (isRaster()) { | 69 | if (isRaster()) { |
70 | -- | 70 | -- |
71 | 2.3.0 | 71 | 2.3.1 |
72 | 72 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch index e30c06fd..2f5835c0 100644 --- a/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 010322a4ca16bcf1ea357689be4a94145733325d Mon Sep 17 00:00:00 2001 | 1 | From ab8aa4e79e156ac6df8cd36e287faf838bc32344 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 09/12] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 09/12] QOpenGLPaintDevice sub-area support |
@@ -153,5 +153,5 @@ index cd268cd..997bc35 100644 | |||
153 | } else { | 153 | } else { |
154 | if (m_vao.isCreated()) { | 154 | if (m_vao.isCreated()) { |
155 | -- | 155 | -- |
156 | 2.3.0 | 156 | 2.3.1 |
157 | 157 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch index d2a1810a..1f92eed8 100644 --- a/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch +++ b/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e163574a35ad782a3d43ee8d5e3f212870962e10 Mon Sep 17 00:00:00 2001 | 1 | From 276b5046788007bcbc5607046becdd44151960c0 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: Thu, 18 Dec 2014 13:41:09 +0100 | 3 | Date: Thu, 18 Dec 2014 13:41:09 +0100 |
4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir | 4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir |
@@ -38,5 +38,5 @@ index 9a846d4..07869ef 100644 | |||
38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) | 38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) |
39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") | 39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") |
40 | -- | 40 | -- |
41 | 2.3.0 | 41 | 2.3.1 |
42 | 42 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch index 728bb5a9..3ff193a5 100644 --- a/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 17929906fd0c057b35ad48b3a22770f8c52c1108 Mon Sep 17 00:00:00 2001 | 1 | From c87f9a5ec9a08c415ede4d5118deeb4177778338 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 11/13] Always build uic | 4 | Subject: [PATCH 11/13] Always build uic |
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/src/src.pro b/src/src.pro | 16 | diff --git a/src/src.pro b/src/src.pro |
17 | index 81f4fa5..74ec23d 100644 | 17 | index 83f7587..9dbcf70 100644 |
18 | --- a/src/src.pro | 18 | --- a/src/src.pro |
19 | +++ b/src/src.pro | 19 | +++ b/src/src.pro |
20 | @@ -162,7 +162,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent | 20 | @@ -163,7 +163,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent |
21 | } | 21 | } |
22 | } | 22 | } |
23 | } | 23 | } |
@@ -27,5 +27,5 @@ index 81f4fa5..74ec23d 100644 | |||
27 | nacl: SUBDIRS -= src_network src_testlib | 27 | nacl: SUBDIRS -= src_network src_testlib |
28 | 28 | ||
29 | -- | 29 | -- |
30 | 2.3.0 | 30 | 2.3.1 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index ef65da08..83457f02 100644 --- a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e199e105df6ded6ea9404b4f7f6f7f8381a51e85 Mon Sep 17 00:00:00 2001 | 1 | From f298d49fd1b88ae9bf8f35339a52cd333f42434b 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 11/12] qmake: don't build it in configure, but allow to build |
@@ -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 8b42b8e..aa21ff6 100755 | 28 | index c19ff6a..7a34b11 100755 |
29 | --- a/configure | 29 | --- a/configure |
30 | +++ b/configure | 30 | +++ b/configure |
31 | @@ -3724,7 +3724,7 @@ setBootstrapEvalVariable() | 31 | @@ -3729,7 +3729,7 @@ setBootstrapEvalVariable() |
32 | 32 | ||
33 | 33 | ||
34 | # build qmake | 34 | # build qmake |
@@ -64,5 +64,5 @@ index 89d6ea5..0ff4a96 100644 | |||
64 | VPATH += \ | 64 | VPATH += \ |
65 | ../src/corelib/global \ | 65 | ../src/corelib/global \ |
66 | -- | 66 | -- |
67 | 2.3.0 | 67 | 2.3.1 |
68 | 68 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch index 90dacc20..82505a7a 100644 --- a/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dee6fc781f5ac77155817b82f9d66787690a3bb3 Mon Sep 17 00:00:00 2001 | 1 | From e598364920b2ff4a90aaaaeb0c58162d1cb64221 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 12/13] Add -external-hostbindir option for native(sdk) | 4 | Subject: [PATCH 12/13] Add -external-hostbindir option for native(sdk) |
@@ -45,7 +45,7 @@ index 051e056..50da6ed 100644 | |||
45 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, | 45 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, |
46 | }; | 46 | }; |
47 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 47 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
48 | index c418c5e..c8c4188 100644 | 48 | index 91ca643..7a567fa 100644 |
49 | --- a/src/corelib/global/qlibraryinfo.cpp | 49 | --- a/src/corelib/global/qlibraryinfo.cpp |
50 | +++ b/src/corelib/global/qlibraryinfo.cpp | 50 | +++ b/src/corelib/global/qlibraryinfo.cpp |
51 | @@ -348,7 +348,7 @@ QLibraryInfo::isDebugBuild() | 51 | @@ -348,7 +348,7 @@ QLibraryInfo::isDebugBuild() |
@@ -104,5 +104,5 @@ index 6e9d4aa..0ca4daf 100644 | |||
104 | << " \"qt_hostspec=" << hostSpec << "\"," << endl | 104 | << " \"qt_hostspec=" << hostSpec << "\"," << endl |
105 | << "#endif" << endl | 105 | << "#endif" << endl |
106 | -- | 106 | -- |
107 | 2.3.0 | 107 | 2.3.1 |
108 | 108 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch b/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch index 3253ed26..204819c8 100644 --- a/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch +++ b/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f14e186762bb31f2d9c1e54fd62a0fa4d6cb3550 Mon Sep 17 00:00:00 2001 | 1 | From dbfa83051ddb8db0b4a59b226d4e4a41101ae26e 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: Thu, 22 Jan 2015 16:09:35 +0100 | 3 | Date: Thu, 22 Jan 2015 16:09:35 +0100 |
4 | Subject: [PATCH 12/12] Set paths for target properly | 4 | Subject: [PATCH 12/12] Set paths for target properly |
@@ -14,10 +14,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | |||
14 | 1 file changed, 21 insertions(+), 22 deletions(-) | 14 | 1 file changed, 21 insertions(+), 22 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure b/configure | 16 | diff --git a/configure b/configure |
17 | index aa21ff6..bc965f6 100755 | 17 | index 7a34b11..7bb4476 100755 |
18 | --- a/configure | 18 | --- a/configure |
19 | +++ b/configure | 19 | +++ b/configure |
20 | @@ -3639,28 +3639,27 @@ static const char qt_configure_prefix_path_strs[][512 + 12] = { | 20 | @@ -3644,28 +3644,27 @@ static const char qt_configure_prefix_path_strs[][512 + 12] = { |
21 | "qt_xmplpath=$QT_SYSROOT_EXAMPLES", | 21 | "qt_xmplpath=$QT_SYSROOT_EXAMPLES", |
22 | "qt_tstspath=$QT_SYSROOT_TESTS", | 22 | "qt_tstspath=$QT_SYSROOT_TESTS", |
23 | #else | 23 | #else |
@@ -68,5 +68,5 @@ index aa21ff6..bc965f6 100755 | |||
68 | }; | 68 | }; |
69 | static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; | 69 | static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; |
70 | -- | 70 | -- |
71 | 2.3.0 | 71 | 2.3.1 |
72 | 72 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch index 319fb55c..4b48b5b6 100644 --- a/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2795008ce11d680385610b80a84b4ee03db78cf0 Mon Sep 17 00:00:00 2001 | 1 | From 4ccd1823b88c039415b68a1dc2040859178cb56f 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 13/13] configure: preserve built qmake and swap with native | 4 | Subject: [PATCH 13/13] configure: preserve built qmake and swap with native |
@@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
13 | 1 file changed, 2 insertions(+) | 13 | 1 file changed, 2 insertions(+) |
14 | 14 | ||
15 | diff --git a/configure b/configure | 15 | diff --git a/configure b/configure |
16 | index 8b42b8e..486bb2d 100755 | 16 | index c19ff6a..2d920e3 100755 |
17 | --- a/configure | 17 | --- a/configure |
18 | +++ b/configure | 18 | +++ b/configure |
19 | @@ -3874,6 +3874,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 19 | @@ -3879,6 +3879,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
20 | 20 | ||
21 | (cd "$outpath/qmake"; "$MAKE") || exit 2 | 21 | (cd "$outpath/qmake"; "$MAKE") || exit 2 |
22 | fi # Build qmake | 22 | fi # Build qmake |
@@ -26,5 +26,5 @@ index 8b42b8e..486bb2d 100755 | |||
26 | echo "Running configuration tests..." | 26 | echo "Running configuration tests..." |
27 | 27 | ||
28 | -- | 28 | -- |
29 | 2.3.0 | 29 | 2.3.1 |
30 | 30 | ||