diff options
Diffstat (limited to 'recipes-qt/qt5')
50 files changed, 252 insertions, 140 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 6de07e06..96d86dbc 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -32,7 +32,7 @@ SRC_URI += " \ | |||
32 | file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \ | 32 | file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \ |
33 | " | 33 | " |
34 | 34 | ||
35 | SRCREV = "8456adf0eeb9df8dd5f0547d4ad5a81888295f03" | 35 | SRCREV = "06e706bdbb826b521389409b53079483fda5584a" |
36 | 36 | ||
37 | LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" | 37 | LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" |
38 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 38 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb index b3169bc9..7107d5b4 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 = "a1ca5b48fafc536b619617f8fa6a3e4798283812" | 7 | SRCREV = "f3abe81d510bef5b984544a6d58551ce04cb8b48" |
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 9 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
10 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ | 10 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 2e325491..71aa8589 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 = "bdb98baf8253c69949a8c259369203da9ffb269c" | 7 | SRCREV = "8a9723d7420829a2ba0141a9f7d8dc8cd11d8331" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 36fbaf85..919880dc 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.3.99+5.4.0-alpha1+git${SRCPV}" | 13 | PV = "5.3.99+5.4.0-beta1+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 60a23391..8f95ccb3 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 7a573e702d37f3e83b92f6b07345aaab05261e7b Mon Sep 17 00:00:00 2001 | 1 | From 71a2437e2ee5a1214ab88c8a3d1d0ddcc012698d 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/11] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/11] Add linux-oe-g++ platform |
@@ -51,7 +51,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
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 1efb645..b1dfca9 100755 | 54 | index 7d6ba9f..1de01a9 100755 |
55 | --- a/configure | 55 | --- a/configure |
56 | +++ b/configure | 56 | +++ b/configure |
57 | @@ -316,6 +316,16 @@ getQMakeConf() | 57 | @@ -316,6 +316,16 @@ getQMakeConf() |
@@ -118,7 +118,7 @@ index 1efb645..b1dfca9 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 | @@ -3141,7 +3159,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | 121 | @@ -3167,7 +3185,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 1efb645..b1dfca9 100755 | |||
127 | 127 | ||
128 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 128 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
129 | 129 | ||
130 | @@ -3176,7 +3194,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 130 | @@ -3205,7 +3223,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 1efb645..b1dfca9 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 | @@ -3647,6 +3665,14 @@ setBootstrapVariable() | 139 | @@ -3676,6 +3694,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,7 +151,7 @@ index 1efb645..b1dfca9 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 | @@ -3685,14 +3711,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 154 | @@ -3714,14 +3740,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= |
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 06331aa7..e4ef88c4 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 e521cd2d84acad69fb3d57a5e97073898d03fbf0 Mon Sep 17 00:00:00 2001 | 1 | From 1e7e18bca925638cb381edbba3f10ce79799d460 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/11] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/11] qlibraryinfo: allow to set qt.conf from the outside |
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 88bb4841..87359429 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 735d4f58381452854ed7b0c2f762030d747098e1 Mon Sep 17 00:00:00 2001 | 1 | From 8f5a3f5b5d8f50661a2c69d5741a9df237600094 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/11] Add -external-hostbindir option | 4 | Subject: [PATCH 03/11] Add -external-hostbindir option |
@@ -38,10 +38,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
38 | 11 files changed, 51 insertions(+), 13 deletions(-) | 38 | 11 files changed, 51 insertions(+), 13 deletions(-) |
39 | 39 | ||
40 | diff --git a/configure b/configure | 40 | diff --git a/configure b/configure |
41 | index b1dfca9..dcd1790 100755 | 41 | index 1de01a9..7d7a98a 100755 |
42 | --- a/configure | 42 | --- a/configure |
43 | +++ b/configure | 43 | +++ b/configure |
44 | @@ -768,6 +768,7 @@ QT_HOST_BINS= | 44 | @@ -769,6 +769,7 @@ QT_HOST_BINS= |
45 | QT_HOST_LIBS= | 45 | QT_HOST_LIBS= |
46 | QT_HOST_DATA= | 46 | QT_HOST_DATA= |
47 | QT_EXT_PREFIX= | 47 | QT_EXT_PREFIX= |
@@ -49,7 +49,7 @@ index b1dfca9..dcd1790 100755 | |||
49 | 49 | ||
50 | #flags for SQL drivers | 50 | #flags for SQL drivers |
51 | QT_CFLAGS_PSQL= | 51 | QT_CFLAGS_PSQL= |
52 | @@ -887,6 +888,7 @@ while [ "$#" -gt 0 ]; do | 52 | @@ -888,6 +889,7 @@ while [ "$#" -gt 0 ]; do |
53 | -testsdir| \ | 53 | -testsdir| \ |
54 | -hostdatadir| \ | 54 | -hostdatadir| \ |
55 | -hostbindir| \ | 55 | -hostbindir| \ |
@@ -57,7 +57,7 @@ index b1dfca9..dcd1790 100755 | |||
57 | -hostlibdir| \ | 57 | -hostlibdir| \ |
58 | -extprefix| \ | 58 | -extprefix| \ |
59 | -sysroot| \ | 59 | -sysroot| \ |
60 | @@ -1101,6 +1103,9 @@ while [ "$#" -gt 0 ]; do | 60 | @@ -1102,6 +1104,9 @@ while [ "$#" -gt 0 ]; do |
61 | extprefix) | 61 | extprefix) |
62 | QT_EXT_PREFIX="$VAL" | 62 | QT_EXT_PREFIX="$VAL" |
63 | ;; | 63 | ;; |
@@ -67,7 +67,7 @@ index b1dfca9..dcd1790 100755 | |||
67 | pkg-config) | 67 | pkg-config) |
68 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 68 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
69 | CFG_PKGCONFIG="$VAL" | 69 | CFG_PKGCONFIG="$VAL" |
70 | @@ -2252,6 +2257,10 @@ Installation options: | 70 | @@ -2260,6 +2265,10 @@ Installation options: |
71 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> | 71 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> |
72 | (default HOSTPREFIX) | 72 | (default HOSTPREFIX) |
73 | 73 | ||
@@ -78,7 +78,7 @@ index b1dfca9..dcd1790 100755 | |||
78 | Configure options: | 78 | Configure options: |
79 | 79 | ||
80 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 80 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
81 | @@ -2916,6 +2925,11 @@ fi | 81 | @@ -2939,6 +2948,11 @@ fi |
82 | # command line and environment validation | 82 | # command line and environment validation |
83 | #------------------------------------------------------------------------------- | 83 | #------------------------------------------------------------------------------- |
84 | 84 | ||
@@ -90,7 +90,7 @@ index b1dfca9..dcd1790 100755 | |||
90 | # update QT_CONFIG to show our current predefined configuration | 90 | # update QT_CONFIG to show our current predefined configuration |
91 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h | 91 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h |
92 | case "$CFG_QCONFIG" in | 92 | case "$CFG_QCONFIG" in |
93 | @@ -3609,6 +3623,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { | 93 | @@ -3638,6 +3652,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { |
94 | "qt_hbinpath=$QT_HOST_BINS", | 94 | "qt_hbinpath=$QT_HOST_BINS", |
95 | "qt_hlibpath=$QT_HOST_LIBS", | 95 | "qt_hlibpath=$QT_HOST_LIBS", |
96 | "qt_hdatpath=$QT_HOST_DATA", | 96 | "qt_hdatpath=$QT_HOST_DATA", |
@@ -99,7 +99,7 @@ index b1dfca9..dcd1790 100755 | |||
99 | "qt_hostspec=$shortspec", | 99 | "qt_hostspec=$shortspec", |
100 | #endif | 100 | #endif |
101 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 101 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
102 | index 709248a..ea2fed0 100644 | 102 | index a9a622d..b6f1db0 100644 |
103 | --- a/mkspecs/features/qt_functions.prf | 103 | --- a/mkspecs/features/qt_functions.prf |
104 | +++ b/mkspecs/features/qt_functions.prf | 104 | +++ b/mkspecs/features/qt_functions.prf |
105 | @@ -191,7 +191,11 @@ defineTest(qtAddRpathLink) { | 105 | @@ -191,7 +191,11 @@ defineTest(qtAddRpathLink) { |
@@ -279,7 +279,7 @@ index 99d87e2..5621dc0 100644 | |||
279 | _qt5_Widgets_check_file_exists(${imported_location}) | 279 | _qt5_Widgets_check_file_exists(${imported_location}) |
280 | 280 | ||
281 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 281 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
282 | index ef71097..7969132 100644 | 282 | index 99ecc7b..6e0f4da 100644 |
283 | --- a/tools/configure/configureapp.cpp | 283 | --- a/tools/configure/configureapp.cpp |
284 | +++ b/tools/configure/configureapp.cpp | 284 | +++ b/tools/configure/configureapp.cpp |
285 | @@ -1191,6 +1191,13 @@ void Configure::parseCmdLine() | 285 | @@ -1191,6 +1191,13 @@ void Configure::parseCmdLine() |
@@ -296,7 +296,7 @@ index ef71097..7969132 100644 | |||
296 | else if (configCmdLine.at(i) == "-make-tool") { | 296 | else if (configCmdLine.at(i) == "-make-tool") { |
297 | ++i; | 297 | ++i; |
298 | if (i == argCount) | 298 | if (i == argCount) |
299 | @@ -3984,6 +3991,7 @@ void Configure::generateQConfigCpp() | 299 | @@ -3994,6 +4001,7 @@ void Configure::generateQConfigCpp() |
300 | << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl | 300 | << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl |
301 | << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl | 301 | << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl |
302 | << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl | 302 | << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl |
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 b7e515a4..b5b77464 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,4 +1,4 @@ | |||
1 | From 73d7d25b8a424eecef197de60a3a504e163f0816 Mon Sep 17 00:00:00 2001 | 1 | From e74a3790f613771099e3373f8e6df506c3520b73 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/11] configureapp: Prefix default LIBDIRS and INCDIRS with | 4 | Subject: [PATCH 04/11] configureapp: Prefix default LIBDIRS and INCDIRS with |
@@ -11,10 +11,10 @@ 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 7969132..439dcfb 100644 | 14 | index 6e0f4da..d72c302 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 | @@ -3373,8 +3373,8 @@ void Configure::generateQConfigPri() | 17 | @@ -3383,8 +3383,8 @@ void Configure::generateQConfigPri() |
18 | configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; | 18 | configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; |
19 | if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { | 19 | if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { |
20 | // FIXME: add detection | 20 | // FIXME: add detection |
diff --git a/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index d1ec16ce..46616066 100644 --- a/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From fcbe3eefa24348cbf98ca9fc9e137ac6ccaf1f87 Mon Sep 17 00:00:00 2001 | 1 | From 9f7dd27bb14cf0c3425c2c8fdec2f6d0df3852f9 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 | 3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 |
4 | Subject: [PATCH 05/11] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH 05/11] qt_module: Fix pkgconfig and libtool replacements |
@@ -80,10 +80,10 @@ index ebc5f00..46319d8 100644 | |||
80 | lib_replace.CONFIG = path | 80 | lib_replace.CONFIG = path |
81 | QMAKE_PRL_INSTALL_REPLACE += lib_replace | 81 | QMAKE_PRL_INSTALL_REPLACE += lib_replace |
82 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | 82 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf |
83 | index 6ab8267..2b4943c 100644 | 83 | index 8599a47..7da73a6 100644 |
84 | --- a/mkspecs/features/qt_module.prf | 84 | --- a/mkspecs/features/qt_module.prf |
85 | +++ b/mkspecs/features/qt_module.prf | 85 | +++ b/mkspecs/features/qt_module.prf |
86 | @@ -188,10 +188,25 @@ unix|mingw { | 86 | @@ -190,10 +190,25 @@ unix|mingw { |
87 | QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module | 87 | QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module |
88 | QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace | 88 | QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace |
89 | 89 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch index 13248024..6e47e815 100644 --- a/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +++ b/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 285b31f709a81b7e51b5c3d96061fa731cdfdf7d Mon Sep 17 00:00:00 2001 | 1 | From 4b6778e44b35d97bd08baded4e5d1f570693ae05 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 06/11] Revert "eglfs: Print the chosen config in debug mode" | 4 | Subject: [PATCH 06/11] Revert "eglfs: Print the chosen config in debug mode" |
@@ -40,15 +40,18 @@ With this change the build is failing with: | |||
40 | 40 | ||
41 | This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. | 41 | This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. |
42 | 42 | ||
43 | Will be partially resolved in newer revision with: | ||
44 | https://codereview.qt-project.org/96220 | ||
45 | |||
43 | Change-Id: I7a6a926b7525d4f137824c71f2ec8cd089c21f13 | 46 | Change-Id: I7a6a926b7525d4f137824c71f2ec8cd089c21f13 |
47 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
44 | --- | 48 | --- |
45 | src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++- | 49 | src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++- |
46 | src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 ------- | 50 | src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 ------- |
47 | src/platformsupport/eglconvenience/qeglplatformintegration.cpp | 4 ++-- | 51 | 2 files changed, 3 insertions(+), 8 deletions(-) |
48 | 3 files changed, 5 insertions(+), 10 deletions(-) | ||
49 | 52 | ||
50 | diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp | 53 | diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp |
51 | index b7ce6df..e8c1925 100644 | 54 | index 1fdeec3..0fa3d88 100644 |
52 | --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp | 55 | --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp |
53 | +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp | 56 | +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp |
54 | @@ -443,9 +443,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) | 57 | @@ -443,9 +443,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) |
@@ -89,28 +92,6 @@ index 7cc3300..ccbd974 100644 | |||
89 | updateFormatFromGL(); | 92 | updateFormatFromGL(); |
90 | } | 93 | } |
91 | 94 | ||
92 | diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration.cpp b/src/platformsupport/eglconvenience/qeglplatformintegration.cpp | ||
93 | index b8205dc..6005684 100644 | ||
94 | --- a/src/platformsupport/eglconvenience/qeglplatformintegration.cpp | ||
95 | +++ b/src/platformsupport/eglconvenience/qeglplatformintegration.cpp | ||
96 | @@ -193,7 +193,7 @@ enum ResourceType { | ||
97 | EglContext, | ||
98 | EglConfig, | ||
99 | NativeDisplay, | ||
100 | - Display | ||
101 | + XDisplay | ||
102 | }; | ||
103 | |||
104 | static int resourceType(const QByteArray &key) | ||
105 | @@ -236,7 +236,7 @@ void *QEGLPlatformIntegration::nativeResourceForScreen(const QByteArray &resourc | ||
106 | void *result = 0; | ||
107 | |||
108 | switch (resourceType(resource)) { | ||
109 | - case Display: | ||
110 | + case XDisplay: | ||
111 | // Play nice when using the x11 hooks: Be compatible with xcb that allows querying | ||
112 | // the X Display pointer, which is nothing but our native display. | ||
113 | result = reinterpret_cast<void*>(nativeDisplay()); | ||
114 | -- | 95 | -- |
115 | 2.1.1 | 96 | 2.1.1 |
116 | 97 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 8f469103..ddc541a7 100644 --- a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9563ef306503f2503a09aadce63020b3048a185d Mon Sep 17 00:00:00 2001 | 1 | From 2ec9a882cd9a0893f2060ef36d28e0568416f9fe 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/11] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 07/11] qeglplatformintegration: Undefine CursorShape from X.h |
diff --git a/recipes-qt/qt5/qtbase-git/0008-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 afe9b743..508f9f98 100644 --- a/recipes-qt/qt5/qtbase-git/0008-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,4 +1,4 @@ | |||
1 | From 33d46bd0229ff9635c14724231eb95f556afd5c2 Mon Sep 17 00:00:00 2001 | 1 | From 00906b6ca765e7e71d354bf675b27b3862af535c 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 08/11] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 08/11] 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 dcd1790..fe6bed4 100755 | 15 | index 7d7a98a..3f05383 100755 |
16 | --- a/configure | 16 | --- a/configure |
17 | +++ b/configure | 17 | +++ b/configure |
18 | @@ -3587,7 +3587,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ | 18 | @@ -3616,7 +3616,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 */ |
diff --git a/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch index de3e2d68..0f663304 100644 --- a/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ b/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5d088522706a3533800e51c011c93d3d2ea58a4d Mon Sep 17 00:00:00 2001 | 1 | From 46cf3a50908de0ccec31de6705674a4c69fb8d6c 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 09/11] eglfs: fix egl error for platforms only supporting one | 4 | Subject: [PATCH 09/11] eglfs: fix egl error for platforms only supporting one |
diff --git a/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch index db979bd4..51a244d7 100644 --- a/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 709c35b889e46f2b1bc36d88c732f1b440e6c236 Mon Sep 17 00:00:00 2001 | 1 | From e7b9af7232c4f7eb50933dde208e58438bedd964 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 10/11] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 10/11] QOpenGLPaintDevice sub-area support |
@@ -12,26 +12,19 @@ Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80 | |||
12 | 12 | ||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
14 | --- | 14 | --- |
15 | src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ | 15 | src/gui/opengl/qopenglpaintdevice.cpp | 11 +++++++++++ |
16 | src/gui/opengl/qopenglpaintdevice.h | 2 ++ | 16 | src/gui/opengl/qopenglpaintdevice.h | 2 ++ |
17 | src/gui/opengl/qopenglpaintdevice_p.h | 1 + | ||
17 | src/gui/opengl/qopenglpaintengine.cpp | 9 +++++++-- | 18 | src/gui/opengl/qopenglpaintengine.cpp | 9 +++++++-- |
18 | src/gui/opengl/qopenglpaintengine_p.h | 1 + | 19 | src/gui/opengl/qopenglpaintengine_p.h | 1 + |
19 | src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- | 20 | src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- |
20 | 5 files changed, 23 insertions(+), 3 deletions(-) | 21 | 6 files changed, 23 insertions(+), 3 deletions(-) |
21 | 22 | ||
22 | diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp | 23 | diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp |
23 | index 59bca6e..ea0ee88 100644 | 24 | index e908fd8..8f0ef56 100644 |
24 | --- a/src/gui/opengl/qopenglpaintdevice.cpp | 25 | --- a/src/gui/opengl/qopenglpaintdevice.cpp |
25 | +++ b/src/gui/opengl/qopenglpaintdevice.cpp | 26 | +++ b/src/gui/opengl/qopenglpaintdevice.cpp |
26 | @@ -103,6 +103,7 @@ class QOpenGLPaintDevicePrivate | 27 | @@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) |
27 | public: | ||
28 | QOpenGLPaintDevicePrivate(const QSize &size); | ||
29 | |||
30 | + QPoint offset; | ||
31 | QSize size; | ||
32 | QOpenGLContext *ctx; | ||
33 | |||
34 | @@ -151,6 +152,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) | ||
35 | { | 28 | { |
36 | } | 29 | } |
37 | 30 | ||
@@ -42,9 +35,9 @@ index 59bca6e..ea0ee88 100644 | |||
42 | +} | 35 | +} |
43 | + | 36 | + |
44 | /*! | 37 | /*! |
45 | Destroys the QOpenGLPaintDevice. | 38 | \internal |
46 | */ | 39 | */ |
47 | @@ -220,6 +227,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const | 40 | @@ -212,6 +218,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const |
48 | return d_ptr->ctx; | 41 | return d_ptr->ctx; |
49 | } | 42 | } |
50 | 43 | ||
@@ -57,17 +50,18 @@ index 59bca6e..ea0ee88 100644 | |||
57 | Returns the pixel size of the paint device. | 50 | Returns the pixel size of the paint device. |
58 | 51 | ||
59 | diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h | 52 | diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h |
60 | index e1be9b5..1a3ddbc 100644 | 53 | index dda3bfe..9965553 100644 |
61 | --- a/src/gui/opengl/qopenglpaintdevice.h | 54 | --- a/src/gui/opengl/qopenglpaintdevice.h |
62 | +++ b/src/gui/opengl/qopenglpaintdevice.h | 55 | +++ b/src/gui/opengl/qopenglpaintdevice.h |
63 | @@ -54,12 +54,14 @@ public: | 56 | @@ -53,6 +53,7 @@ public: |
64 | QOpenGLPaintDevice(); | 57 | QOpenGLPaintDevice(); |
65 | explicit QOpenGLPaintDevice(const QSize &size); | 58 | explicit QOpenGLPaintDevice(const QSize &size); |
66 | QOpenGLPaintDevice(int width, int height); | 59 | QOpenGLPaintDevice(int width, int height); |
67 | + QOpenGLPaintDevice(int x, int y, int width, int height); | 60 | + QOpenGLPaintDevice(int x, int y, int width, int height); |
61 | QOpenGLPaintDevice(QOpenGLPaintDevicePrivate *dd); | ||
68 | virtual ~QOpenGLPaintDevice(); | 62 | virtual ~QOpenGLPaintDevice(); |
69 | 63 | ||
70 | int devType() const { return QInternal::OpenGL; } | 64 | @@ -60,6 +61,7 @@ public: |
71 | QPaintEngine *paintEngine() const; | 65 | QPaintEngine *paintEngine() const; |
72 | 66 | ||
73 | QOpenGLContext *context() const; | 67 | QOpenGLContext *context() const; |
@@ -75,11 +69,23 @@ index e1be9b5..1a3ddbc 100644 | |||
75 | QSize size() const; | 69 | QSize size() const; |
76 | void setSize(const QSize &size); | 70 | void setSize(const QSize &size); |
77 | void setDevicePixelRatio(qreal devicePixelRatio); | 71 | void setDevicePixelRatio(qreal devicePixelRatio); |
72 | diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h | ||
73 | index 0b01129..211f2f3 100644 | ||
74 | --- a/src/gui/opengl/qopenglpaintdevice_p.h | ||
75 | +++ b/src/gui/opengl/qopenglpaintdevice_p.h | ||
76 | @@ -65,6 +65,7 @@ public: | ||
77 | |||
78 | public: | ||
79 | QSize size; | ||
80 | + QPoint offset; | ||
81 | QOpenGLContext *ctx; | ||
82 | |||
83 | qreal dpmx; | ||
78 | diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp | 84 | diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp |
79 | index 21bc4a9..ce008a4 100644 | 85 | index c490726..1d775fd 100644 |
80 | --- a/src/gui/opengl/qopenglpaintengine.cpp | 86 | --- a/src/gui/opengl/qopenglpaintengine.cpp |
81 | +++ b/src/gui/opengl/qopenglpaintengine.cpp | 87 | +++ b/src/gui/opengl/qopenglpaintengine.cpp |
82 | @@ -1999,7 +1999,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) | 88 | @@ -2002,7 +2002,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) |
83 | for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) | 89 | for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) |
84 | d->vertexAttributeArraysEnabledState[i] = false; | 90 | d->vertexAttributeArraysEnabledState[i] = false; |
85 | 91 | ||
@@ -90,7 +96,7 @@ index 21bc4a9..ce008a4 100644 | |||
90 | d->width = sz.width(); | 96 | d->width = sz.width(); |
91 | d->height = sz.height(); | 97 | d->height = sz.height(); |
92 | d->mode = BrushDrawingMode; | 98 | d->mode = BrushDrawingMode; |
93 | @@ -2084,7 +2087,7 @@ void QOpenGL2PaintEngineEx::ensureActive() | 99 | @@ -2089,7 +2092,7 @@ void QOpenGL2PaintEngineEx::ensureActive() |
94 | d->device->ensureActiveTarget(); | 100 | d->device->ensureActiveTarget(); |
95 | 101 | ||
96 | d->transferMode(BrushDrawingMode); | 102 | d->transferMode(BrushDrawingMode); |
@@ -99,7 +105,7 @@ index 21bc4a9..ce008a4 100644 | |||
99 | d->needsSync = false; | 105 | d->needsSync = false; |
100 | d->lastMaskTextureUsed = 0; | 106 | d->lastMaskTextureUsed = 0; |
101 | d->shaderManager->setDirty(); | 107 | d->shaderManager->setDirty(); |
102 | @@ -2127,6 +2130,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | 108 | @@ -2132,6 +2135,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() |
103 | if (bounds == QRect(0, 0, width, height)) { | 109 | if (bounds == QRect(0, 0, width, height)) { |
104 | funcs.glDisable(GL_SCISSOR_TEST); | 110 | funcs.glDisable(GL_SCISSOR_TEST); |
105 | } else { | 111 | } else { |
@@ -107,7 +113,7 @@ index 21bc4a9..ce008a4 100644 | |||
107 | funcs.glEnable(GL_SCISSOR_TEST); | 113 | funcs.glEnable(GL_SCISSOR_TEST); |
108 | setScissor(bounds); | 114 | setScissor(bounds); |
109 | } | 115 | } |
110 | @@ -2135,12 +2139,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | 116 | @@ -2140,12 +2144,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() |
111 | 117 | ||
112 | void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) | 118 | void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) |
113 | { | 119 | { |
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 9bd001b4..8ef6eaa2 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 2dd5a897d7e2f073b4223595a7bf214d3481b68a Mon Sep 17 00:00:00 2001 | 1 | From 8a3493c260f8b0580f9dd0ab2dafbf968c14e019 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/12] Always build uic | 4 | Subject: [PATCH 11/12] Always build uic |
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 e39693ff..1e701c7d 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 5d6e6b18d2049bad370c594e5ab30fd85c0ed047 Mon Sep 17 00:00:00 2001 | 1 | From d750936020f354b8c59bbfcbf3930115c390d36d 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/11] qmake: don't build it in configure, but allow to build | 4 | Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build |
@@ -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 fe6bed4..9628be2 100755 | 23 | index 3f05383..05ae996 100755 |
24 | --- a/configure | 24 | --- a/configure |
25 | +++ b/configure | 25 | +++ b/configure |
26 | @@ -3689,7 +3689,7 @@ setBootstrapEvalVariable() | 26 | @@ -3718,7 +3718,7 @@ setBootstrapEvalVariable() |
27 | 27 | ||
28 | 28 | ||
29 | # build qmake | 29 | # build qmake |
diff --git a/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch index c9941206..d89f3446 100644 --- a/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f1b4d7d4c96b6ded9bd312f6db2ba735feb001c0 Mon Sep 17 00:00:00 2001 | 1 | From 36b89f6e50e2b28d8646a5e77cdac36ecbd6ba4f 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 12/12] configure: preserve built qmake and swap with native | 4 | Subject: [PATCH 12/12] 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 fe6bed4..ea661a3 100755 | 16 | index 3f05383..d6ff774 100755 |
17 | --- a/configure | 17 | --- a/configure |
18 | +++ b/configure | 18 | +++ b/configure |
19 | @@ -3839,6 +3839,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 19 | @@ -3868,6 +3868,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 |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index d902b18b..5853731f 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -30,7 +30,7 @@ do_install_append() { | |||
30 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 30 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
31 | } | 31 | } |
32 | 32 | ||
33 | SRCREV = "8456adf0eeb9df8dd5f0547d4ad5a81888295f03" | 33 | SRCREV = "06e706bdbb826b521389409b53079483fda5584a" |
34 | 34 | ||
35 | LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" | 35 | LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" |
36 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 36 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 2e938c9e..443f64a1 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -24,7 +24,7 @@ SRC_URI += "\ | |||
24 | file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ | 24 | file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ |
25 | " | 25 | " |
26 | 26 | ||
27 | SRCREV = "8456adf0eeb9df8dd5f0547d4ad5a81888295f03" | 27 | SRCREV = "06e706bdbb826b521389409b53079483fda5584a" |
28 | 28 | ||
29 | LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" | 29 | LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" |
30 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 30 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 195b267b..505d33bb 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${BPN}.inc | 2 | require ${BPN}.inc |
3 | 3 | ||
4 | SRCREV = "0f6e9cc18007c718de8ec399f5b60687ecffe9c2" | 4 | SRCREV = "4a6d4e8682384887d1b30b9c3107f47c57d7ee3f" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch index 78ef3e11..2c0b3b69 100644 --- a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3bab0b12be56ec7c85c5648a304aba98dc09ed60 Mon Sep 17 00:00:00 2001 | 1 | From 74983b3dfdf23880ce63d7ecb866a9e08bff923d Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> |
3 | Date: Sun, 26 May 2013 14:26:19 +0200 | 3 | Date: Sun, 26 May 2013 14:26:19 +0200 |
4 | Subject: [PATCH] qmltestexample: fix link | 4 | Subject: [PATCH] qmltestexample: fix link |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 5957c45e..99e9ebbb 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 = "29b77e5e0759472ab1f7da1dd756b857d3b2ddd7" | 4 | SRCREV = "d767254ee09e9fd773bd40c93395609ac8bbf7e6" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index ff3c1c4f..c54bec77 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb | |||
@@ -2,7 +2,7 @@ require qt5-git.inc | |||
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | QT_MODULE_BRANCH = "1.1" | 4 | QT_MODULE_BRANCH = "1.1" |
5 | SRCREV = "2b93eb45116e0bf2cc62f614de66cfd261c552df" | 5 | SRCREV = "f8ad37de2d7170d1548252608f8c04aac6ec1035" |
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
8 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ | 8 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 95aac636..2e024b15 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 = "bdd7e47ff1357bcc3b81c7ff5c10189c6a9b0290" | 4 | SRCREV = "9e9600d92224084f7942a6bd83b926c630a29747" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 4f15caac..cfbf70a9 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 = "08f40bc0f00716c3a8cbda70ed00dc2f16515e85" | 4 | SRCREV = "fef13b3b4c1a8af83086ecf49430903778e63624" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 38980b12..d85307f8 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 = "b90e043af09955d94a7a9555f11b5d6f3add4c3a" | 4 | SRCREV = "eebf55a6919dff9eec4dd8529223aae6f6d0f569" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
diff --git a/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch index 39601315..5c12cbd3 100644 --- a/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch +++ b/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4f9e752e6ecd4e2058f5d4f43578e5b21b6efbf8 Mon Sep 17 00:00:00 2001 | 1 | From b16e42196969a6277e7b8902488fad1950a52d0d Mon Sep 17 00:00:00 2001 |
2 | From: Yoann Lopes <yoann.lopes@digia.com> | 2 | From: Yoann Lopes <yoann.lopes@digia.com> |
3 | Date: Thu, 31 Oct 2013 15:06:30 +0100 | 3 | Date: Thu, 31 Oct 2013 15:06:30 +0100 |
4 | Subject: [PATCH 1/2] Initial porting effort to GStreamer 1.0. | 4 | Subject: [PATCH 1/2] Initial porting effort to GStreamer 1.0. |
@@ -1689,22 +1689,22 @@ index f944a60..72d1cf1 100644 | |||
1689 | if (m_duration != duration) { | 1689 | if (m_duration != duration) { |
1690 | m_duration = duration; | 1690 | m_duration = duration; |
1691 | diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp | 1691 | diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp |
1692 | index 850f8c1..f4e2383 100644 | 1692 | index 0197839..128ab58 100644 |
1693 | --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp | 1693 | --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp |
1694 | +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp | 1694 | +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp |
1695 | @@ -724,7 +724,11 @@ qint64 CameraBinSession::duration() const | 1695 | @@ -728,7 +728,11 @@ qint64 CameraBinSession::duration() const |
1696 | GstFormat format = GST_FORMAT_TIME; | 1696 | if (fileSink) { |
1697 | gint64 duration = 0; | 1697 | GstFormat format = GST_FORMAT_TIME; |
1698 | 1698 | gint64 duration = 0; | |
1699 | +#if GST_CHECK_VERSION(1,0,0) | 1699 | +#if GST_CHECK_VERSION(1,0,0) |
1700 | + if ( m_camerabin && gst_element_query_duration(m_camerabin, format, &duration)) | 1700 | + bool ret = gst_element_query_duration(fileSink, format, &duration); |
1701 | +#else | 1701 | +#else |
1702 | if ( m_camerabin && gst_element_query_position(m_camerabin, &format, &duration)) | 1702 | bool ret = gst_element_query_position(fileSink, &format, &duration); |
1703 | +#endif | 1703 | +#endif |
1704 | return duration / 1000000; | 1704 | gst_object_unref(GST_OBJECT(fileSink)); |
1705 | else | 1705 | if (ret) |
1706 | return 0; | 1706 | return duration / 1000000; |
1707 | @@ -757,8 +761,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data) | 1707 | @@ -765,8 +769,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data) |
1708 | 1708 | ||
1709 | if (m_camerabin) { | 1709 | if (m_camerabin) { |
1710 | GstIterator *elements = gst_bin_iterate_all_by_interface(GST_BIN(m_camerabin), GST_TYPE_TAG_SETTER); | 1710 | GstIterator *elements = gst_bin_iterate_all_by_interface(GST_BIN(m_camerabin), GST_TYPE_TAG_SETTER); |
@@ -1718,7 +1718,7 @@ index 850f8c1..f4e2383 100644 | |||
1718 | gst_tag_setter_reset_tags(GST_TAG_SETTER(element)); | 1718 | gst_tag_setter_reset_tags(GST_TAG_SETTER(element)); |
1719 | 1719 | ||
1720 | QMapIterator<QByteArray, QVariant> it(data); | 1720 | QMapIterator<QByteArray, QVariant> it(data); |
1721 | @@ -819,7 +828,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) | 1721 | @@ -827,7 +836,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) |
1722 | 1722 | ||
1723 | if (gm && GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ELEMENT) { | 1723 | if (gm && GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ELEMENT) { |
1724 | if (m_captureMode == QCamera::CaptureStillImage && | 1724 | if (m_captureMode == QCamera::CaptureStillImage && |
@@ -1730,7 +1730,7 @@ index 850f8c1..f4e2383 100644 | |||
1730 | st = gst_message_get_structure(gm); | 1730 | st = gst_message_get_structure(gm); |
1731 | 1731 | ||
1732 | if (gst_structure_has_field_typed(st, "buffer", GST_TYPE_BUFFER)) { | 1732 | if (gst_structure_has_field_typed(st, "buffer", GST_TYPE_BUFFER)) { |
1733 | @@ -829,7 +842,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) | 1733 | @@ -837,7 +850,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) |
1734 | 1734 | ||
1735 | QImage img; | 1735 | QImage img; |
1736 | 1736 | ||
@@ -1742,7 +1742,7 @@ index 850f8c1..f4e2383 100644 | |||
1742 | if (caps) { | 1742 | if (caps) { |
1743 | GstStructure *structure = gst_caps_get_structure(caps, 0); | 1743 | GstStructure *structure = gst_caps_get_structure(caps, 0); |
1744 | gint width = 0; | 1744 | gint width = 0; |
1745 | @@ -1102,7 +1119,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame | 1745 | @@ -1110,7 +1127,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame |
1746 | gst_structure_remove_all_fields(structure); | 1746 | gst_structure_remove_all_fields(structure); |
1747 | gst_structure_set_value(structure, "framerate", &rate); | 1747 | gst_structure_set_value(structure, "framerate", &rate); |
1748 | } | 1748 | } |
@@ -1754,7 +1754,7 @@ index 850f8c1..f4e2383 100644 | |||
1754 | 1754 | ||
1755 | 1755 | ||
1756 | for (uint i=0; i<gst_caps_get_size(caps); i++) { | 1756 | for (uint i=0; i<gst_caps_get_size(caps); i++) { |
1757 | @@ -1222,7 +1243,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate, | 1757 | @@ -1230,7 +1251,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate, |
1758 | gst_structure_set_value(structure, "width", &w); | 1758 | gst_structure_set_value(structure, "width", &w); |
1759 | gst_structure_set_value(structure, "height", &h); | 1759 | gst_structure_set_value(structure, "height", &h); |
1760 | } | 1760 | } |
diff --git a/recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch b/recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch index 1f82d49c..d225d079 100644 --- a/recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch +++ b/recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ee12423779327f2cbb46ada326fa0a997c93a93d Mon Sep 17 00:00:00 2001 | 1 | From 392d324d86e3b889acfce4f3469158dd942cc969 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, 5 Jul 2014 09:10:02 +0200 | 3 | Date: Sat, 5 Jul 2014 09:10:02 +0200 |
4 | Subject: [PATCH 2/2] qtmultimedia.pro: Respect | 4 | Subject: [PATCH 2/2] qtmultimedia.pro: Respect |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 48cab357..f6eadd97 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 = "f02d9e934322fbf9af8a5503c1bda37552988b2b" | 4 | SRCREV = "b366a99eb14f166ebdcfcb6d328b4d7552227b71" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 873c3592..8a48e0cb 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 = "af503cb8014c5b0fb2928ac1596a042d979a94a3" | 4 | SRCREV = "61df13088c6c1d6a1b5a6d329dcc6879b33d69ba" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 77b499ad..9a5e28cc 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 = "ebbf3629ae53755c3b5dd0912585a40545f391fc" | 4 | SRCREV = "737379ad810d4431a93bed214f50b25632ba00e5" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 029c1077..1d5c448f 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 = "14710df8fa3b8c31cdbf0243d268a006e667e13a" | 4 | SRCREV = "9871b41531d632105f1d11e3a9683b05061177c1" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 6e2a36af..fc828fd1 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 = "4756a79d456d2fdd7aa1e5cb562a50165daf3d7f" | 4 | SRCREV = "ff98a9a27a18e6a48afa705e5cd84bd9461ad554" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 6d2ab1ce..82a58bd5 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_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 = "ef8ed357881b212e2debe2ccf975996bca2331c2" | 4 | SRCREV = "3bb682ea29ffaf72ff73e6eb57abdc5c59524e8a" |
5 | 5 | ||
6 | # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what | 6 | # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what |
7 | # other qt* components use :/ | 7 | # other qt* components use :/ |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 118a0991..704a1994 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 = "bf249abee98727d517f52b1126dc7fda8af4e302" | 4 | SRCREV = "9f1c31c8a3cfd0f341987e8011abad172592dd3c" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
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 c176b4e8..af431dc5 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 ba804f69b32dc9a3554d2901cd1897039be33553 Mon Sep 17 00:00:00 2001 | 1 | From f8476dd4e4069b4403f26b5ccd5c3d9d9402c7bd 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/3] Allow to build only lrelease + lupdate + lconvert | 4 | Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert |
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 13857911..764c3e58 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 ac277dcb43d53ce6d87c58f4afef295fe44a49ea Mon Sep 17 00:00:00 2001 | 1 | From d43c5a3759ceee4ba0e0e6d94c61d13850e142ec 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/3] assistant/help: fix linking of dependent libraries | 4 | Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries |
diff --git a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch index ba96f5a8..535a24c4 100644 --- a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b50a6739b3d38f06901e7812864e3f7122f3d0c8 Mon Sep 17 00:00:00 2001 | 1 | From 5012d9057afa20e34aa8a36c195f87b89d0fbf8c 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, 4 Jun 2014 11:28:16 +0200 | 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 |
4 | Subject: [PATCH 3/3] add noqtwebkit configuration | 4 | Subject: [PATCH 3/3] add noqtwebkit configuration |
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb index db3e5401..fade6251 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 = "a1ca5b48fafc536b619617f8fa6a3e4798283812" | 4 | SRCREV = "f3abe81d510bef5b984544a6d58551ce04cb8b48" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ | 7 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index db3e5401..fade6251 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 = "a1ca5b48fafc536b619617f8fa6a3e4798283812" | 4 | SRCREV = "f3abe81d510bef5b984544a6d58551ce04cb8b48" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ | 7 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ |
diff --git a/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch new file mode 100644 index 00000000..16433d55 --- /dev/null +++ b/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 3cf60039ff1825c58bee5c79c66e7d12f4039fc7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Busch <morphis@gravedo.de> | ||
3 | Date: Fri, 19 Jul 2013 13:35:14 +0000 | ||
4 | Subject: [PATCH] Install the qtwaylandscanner tool to the native side | ||
5 | |||
6 | Upstream-Status: Inappropiate [configuration] | ||
7 | |||
8 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
9 | --- | ||
10 | src/qtwaylandscanner/qtwaylandscanner.pro | 8 ++++++-- | ||
11 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro | ||
14 | index ac2d07b..7a46a24 100644 | ||
15 | --- a/src/qtwaylandscanner/qtwaylandscanner.pro | ||
16 | +++ b/src/qtwaylandscanner/qtwaylandscanner.pro | ||
17 | @@ -1,6 +1,10 @@ | ||
18 | option(host_build) | ||
19 | |||
20 | -SOURCES += qtwaylandscanner.cpp | ||
21 | +TARGET = qtwaylandscanner$$qtPlatformTargetSuffix() | ||
22 | +CONFIG += console warn_off | ||
23 | +QT = core | ||
24 | |||
25 | -load(qt_tool) | ||
26 | +SOURCES += qtwaylandscanner.cpp | ||
27 | |||
28 | +target.path = $$[QT_HOST_BINS] | ||
29 | +INSTALLS += target | ||
30 | -- | ||
31 | 2.1.1 | ||
32 | |||
diff --git a/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch new file mode 100644 index 00000000..1af124a6 --- /dev/null +++ b/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 9c98c0c411ecaf4cb95b76d0c07e72af75a8d7f0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 | ||
4 | Subject: [PATCH] examples/wayland: include server-buffer only when building | ||
5 | with opengles2 | ||
6 | |||
7 | * it's using glBindBuffer in | ||
8 | server-buffer/client/serverbufferrenderer.cpp | ||
9 | |||
10 | Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78 | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | examples/wayland/wayland.pro | 4 +++- | ||
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro | ||
17 | index d633fb9..643c7cd 100644 | ||
18 | --- a/examples/wayland/wayland.pro | ||
19 | +++ b/examples/wayland/wayland.pro | ||
20 | @@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { | ||
21 | SUBDIRS += qml-compositor | ||
22 | } | ||
23 | |||
24 | - SUBDIRS += server-buffer | ||
25 | + contains(QT_CONFIG, opengles2) { | ||
26 | + SUBDIRS += server-buffer | ||
27 | + } | ||
28 | } | ||
29 | -- | ||
30 | 2.1.1 | ||
31 | |||
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 79349554..f7d04666 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_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 = "5f718c7d04d44c3878018e8070b18cf0e7486eb0" | 4 | SRCREV = "c3d2a7bd8af4102441c113e088bd6a2cb50b97cf" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 62a718e2..3d53a324 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -1,10 +1,10 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "5f718c7d04d44c3878018e8070b18cf0e7486eb0" | 4 | SRCREV = "c3d2a7bd8af4102441c113e088bd6a2cb50b97cf" |
5 | 5 | ||
6 | SRC_URI += " \ | 6 | SRC_URI += " \ |
7 | file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \ | 7 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ |
8 | " | 8 | " |
9 | 9 | ||
10 | QT_VERSION ?= "5.4.0" | 10 | QT_VERSION ?= "5.4.0" |
diff --git a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch new file mode 100644 index 00000000..3e8d7acc --- /dev/null +++ b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 1e2fbd3bbf3eb94a4d78c53068bbb58d4227ab46 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 | ||
4 | Subject: [PATCH 1/2] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H | ||
5 | anywhere in patch, but at the end | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | ||
9 | tools/qmake/mkspecs/features/functions.prf | 4 ++-- | ||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | ||
13 | index 02c3872..3b9babe 100644 | ||
14 | --- a/tools/qmake/mkspecs/features/functions.prf | ||
15 | +++ b/tools/qmake/mkspecs/features/functions.prf | ||
16 | @@ -61,8 +61,8 @@ defineReplace(findIncludedMocFiles) { | ||
17 | defineReplace(mocOutput) { | ||
18 | out = $$1 | ||
19 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | ||
20 | - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|)), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | ||
21 | - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|)), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | ||
22 | + out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | ||
23 | + out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | ||
24 | return($$out) | ||
25 | } | ||
26 | |||
27 | -- | ||
28 | 2.1.1 | ||
29 | |||
diff --git a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch new file mode 100644 index 00000000..646d2a6e --- /dev/null +++ b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 4fd50d344ad5e7f89e538222605dd50d0f636d3a Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 1 Jul 2014 15:58:16 +0200 | ||
4 | Subject: [PATCH 2/2] functions.prf: Try to add _moc suffix | ||
5 | |||
6 | * otherwise moc generated files have the same basename and do_configure fails with: | ||
7 | core_generated.gyp:QtWebEngineCore#target has several files with the same basename: | ||
8 | | javascript_dialog_controller: javascript_dialog_controller.cpp | ||
9 | | /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOINC+21f6ce84ec-r0/git/src/core/.moc/moc_/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOI.moc+21f6ce84ec-r0/git/src/core/javascript_dialog_controller.cpp | ||
10 | ... | ||
11 | |||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | --- | ||
14 | tools/qmake/mkspecs/features/functions.prf | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | ||
18 | index 3b9babe..6d691df 100644 | ||
19 | --- a/tools/qmake/mkspecs/features/functions.prf | ||
20 | +++ b/tools/qmake/mkspecs/features/functions.prf | ||
21 | @@ -61,8 +61,8 @@ defineReplace(findIncludedMocFiles) { | ||
22 | defineReplace(mocOutput) { | ||
23 | out = $$1 | ||
24 | # The order is important, since the output of the second replace would end up accidentaly transformed by the first one | ||
25 | - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | ||
26 | - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | ||
27 | + out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1_moc$${QMAKE_EXT_CPP_MOC}) | ||
28 | + out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1_moc$${first(QMAKE_EXT_CPP)}) | ||
29 | return($$out) | ||
30 | } | ||
31 | |||
32 | -- | ||
33 | 2.1.1 | ||
34 | |||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 360a1c8d..7fe21900 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -10,14 +10,13 @@ QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based" | |||
10 | SRC_URI = " \ | 10 | SRC_URI = " \ |
11 | git://gitorious.org/qt/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \ | 11 | git://gitorious.org/qt/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \ |
12 | git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ | 12 | git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ |
13 | file://0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch \ | 13 | file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ |
14 | file://0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ | 14 | file://0002-functions.prf-Try-to-add-_moc-suffix.patch \ |
15 | file://0003-functions.prf-Try-to-add-_moc-suffix.patch \ | ||
16 | file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \ | 15 | file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \ |
17 | file://0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch \ | 16 | file://0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch \ |
18 | file://0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \ | 17 | file://0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \ |
19 | " | 18 | " |
20 | SRCREV_qtwebengine = "4ffc07ddb8739da9e94a2b23b03c63fd7b74c09a" | 19 | SRCREV_qtwebengine = "14fcf0d3193e2ee2bf904a305c9f34ff8d0e5ce7" |
21 | SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff" | 20 | SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff" |
22 | 21 | ||
23 | SRCREV_FORMAT = "qtwebengine" | 22 | SRCREV_FORMAT = "qtwebengine" |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index e54d3979..216d9100 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -3,4 +3,4 @@ require ${PN}.inc | |||
3 | 3 | ||
4 | DEPENDS += "leveldb" | 4 | DEPENDS += "leveldb" |
5 | 5 | ||
6 | SRCREV = "3a51e3ee766490fe6f9ab9511d19e16f75e07db8" | 6 | SRCREV = "7778f881ff7dc92fca44dd414b02e7345f8db930" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 0631f564..28e972a9 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_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 = "f6175568bb32b87a3d6cd55382fa1c8e1a1de2b4" | 4 | SRCREV = "0854eda408de542047a0ef38c37953719a8f9fde" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 5c7246d0..9033536d 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 = "eef0ba60200d8039c05073ce707c2352ac0944a8" | 4 | SRCREV = "045028f951959dc217a0fc1c19f014989bfaaa1f" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |