From 4b7182a3be2b591e8190ff15b7a121191e4b201f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 7 Feb 2014 04:10:06 +0100 Subject: qt5: Upgrade from 5.2.0 to 5.2.1 * qtwayland: Use default LICENSE and LIC_FILES_CHKSUM * license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a * qtdeclarative, qtserialport: Update QT_MODULE_BRANCH * SHA-1 of v5.2.1 tag is only in release branch Signed-off-by: Martin Jansa --- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 14 ++++----- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 4 +-- .../0003-Add-external-hostbindir-option.patch | 22 +++++++------- ...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 6 ++-- .../0005-qt_module-Fix-pkgconfig-replacement.patch | 8 ++--- ...on-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | 6 ++-- ....prf-Allow-to-add-extra-arguments-to-make.patch | 4 +-- ...ake-pulseaudio-alsa-freetype-a-configurab.patch | 11 ++++--- ...E_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch | 8 ++--- recipes-qt/qt5/qtbase/0010-Always-build-uic.patch | 4 +-- ...0-qmake-is-already-built-in-qtbase-native.patch | 8 ++--- ...-building-a-separate-qmake-for-the-target.patch | 4 +-- ...reserve-built-qmake-and-swap-with-native-.patch | 8 ++--- ...ump-path-length-from-256-to-512-character.patch | 8 ++--- .../0012-qtbase-allow-build-of-examples.patch | 4 +-- .../0013-QOpenGLPaintDevice-sub-area-support.patch | 4 +-- ...tslib-device-to-be-read-from-env-variable.patch | 35 ---------------------- 17 files changed, 63 insertions(+), 95 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch (limited to 'recipes-qt/qt5/qtbase') diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 0976c343..5ce4cdd1 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From f4fd2da9b29db23638ad07bd35f093f793241526 Mon Sep 17 00:00:00 2001 +From f883ec8652ee603d9bb9def7eb669ed82c493961 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH 01/14] Add linux-oe-g++ platform @@ -41,7 +41,7 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index a330dd6..1b328ae 100755 +index aaa59bd..0e74f29 100755 --- a/configure +++ b/configure @@ -324,6 +324,16 @@ getQMakeConf() @@ -97,7 +97,7 @@ index a330dd6..1b328ae 100755 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" for varname in $SYSTEM_VARIABLES; do qmakevarname="${varname}" -@@ -3344,7 +3376,7 @@ if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then +@@ -3362,7 +3394,7 @@ if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then CFG_QGTKSTYLE=no fi @@ -106,7 +106,7 @@ index a330dd6..1b328ae 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3379,7 +3411,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -3397,7 +3429,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then exit 1 fi fi @@ -115,7 +115,7 @@ index a330dd6..1b328ae 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3860,6 +3892,14 @@ setBootstrapVariable() +@@ -3878,6 +3910,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" } @@ -130,7 +130,7 @@ index a330dd6..1b328ae 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3898,11 +3938,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3916,11 +3956,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= @@ -300,5 +300,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index afc25cc4..2f72dca5 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,4 +1,4 @@ -From c6c1e780ed6a443a0c68c3200aeea9ced76f444c Mon Sep 17 00:00:00 2001 +From 841d1f06f3fd2f59f6b18067b02d5fcfc93aaa7a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside @@ -32,5 +32,5 @@ index 1c3b09f..c647a16 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index 3f7854fd..7e03f740 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch @@ -1,4 +1,4 @@ -From 21c595fd0e386bea1a2e2b19323dc517bb2c7333 Mon Sep 17 00:00:00 2001 +From 3648eeddaed0cf31fba226ec713d2321f398974f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH 03/14] Add -external-hostbindir option @@ -28,10 +28,10 @@ Signed-off-by: Martin Jansa 8 files changed, 45 insertions(+), 7 deletions(-) diff --git a/configure b/configure -index 1b328ae..46f7230 100755 +index 0e74f29..7f3f2f0 100755 --- a/configure +++ b/configure -@@ -785,6 +785,7 @@ QT_HOST_BINS= +@@ -788,6 +788,7 @@ QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= QT_EXT_PREFIX= @@ -39,7 +39,7 @@ index 1b328ae..46f7230 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -905,6 +906,7 @@ while [ "$#" -gt 0 ]; do +@@ -907,6 +908,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \ @@ -47,7 +47,7 @@ index 1b328ae..46f7230 100755 -hostlibdir| \ -extprefix| \ -sysroot| \ -@@ -1118,6 +1120,9 @@ while [ "$#" -gt 0 ]; do +@@ -1120,6 +1122,9 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;; @@ -57,7 +57,7 @@ index 1b328ae..46f7230 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -2226,6 +2231,10 @@ Installation options: +@@ -2236,6 +2241,10 @@ Installation options: -hostdatadir . Data used by qmake will be installed to (default HOSTPREFIX) @@ -68,7 +68,7 @@ index 1b328ae..46f7230 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -3133,6 +3142,11 @@ fi +@@ -3151,6 +3160,11 @@ fi # command line and environment validation #------------------------------------------------------------------------------- @@ -80,7 +80,7 @@ index 1b328ae..46f7230 100755 # update QT_CONFIG to show our current predefined configuration CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h case "$CFG_QCONFIG" in -@@ -3820,6 +3834,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { +@@ -3838,6 +3852,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_hbinpath=$QT_HOST_BINS", "qt_hlibpath=$QT_HOST_LIBS", "qt_hdatpath=$QT_HOST_DATA", @@ -135,7 +135,7 @@ index e50485c..71291ad 100644 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/qtbase.pro b/qtbase.pro -index 7576db7..d51af0e 100644 +index 140a137..4e01d5b 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -70,16 +70,22 @@ CONFIG -= qt @@ -198,7 +198,7 @@ index 17864b5..a14bc0f 100644 HostSpecPath, LastHostPath = HostSpecPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index e2fef2c..ab475c3 100644 +index 5ab413a..50a192b 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1186,6 +1186,13 @@ void Configure::parseCmdLine() @@ -224,5 +224,5 @@ index e2fef2c..ab475c3 100644 << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index 71a45969..16317ac7 100644 --- a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,4 +1,4 @@ -From 925a8c67fef4bfa56bdc3c1c7cd87e21defc3d94 Mon Sep 17 00:00:00 2001 +From 698f073fb8cc6dc1ced277b6ae2056cb9d02f2d5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 22:33:33 +0200 Subject: [PATCH 04/14] configureapp: Prefix default LIBDIRS and INCDIRS with @@ -10,7 +10,7 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index ab475c3..68cd43d 100644 +index 50a192b..46eabe4 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3213,8 +3213,8 @@ void Configure::generateQConfigPri() @@ -25,5 +25,5 @@ index ab475c3..68cd43d 100644 configStream << "}" << endl; if (dictionary["QT_EDITION"].contains("OPENSOURCE")) -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch index f85fb33b..833c9b59 100644 --- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch @@ -1,4 +1,4 @@ -From 33bbb10c66df59abfad9f4576462f63dfb500149 Mon Sep 17 00:00:00 2001 +From 1f9449f851f7ec288948ec8e83f2fe4b0b37e789 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Apr 2013 23:15:37 +0200 Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement @@ -33,13 +33,13 @@ Content-Transfer-Encoding: 8bit * fix paths in packageconfig files This reverts parts of: + enable path replacement in installed prl files on all platforms + Task-number: QTBUG-33794 Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b Reviewed-by: Joerg Bornemann -Upstream-Status: Pending - Signed-off-by: Martin Jansa Signed-off-by: Andreas Müller --- @@ -113,5 +113,5 @@ index 11509ee..2f95684 100644 unix|win32-g++* { -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 82e028d7..726bfe00 100644 --- a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,4 +1,4 @@ -From ce1afee66a6310f362644e71d17f8d1eb3f848da Mon Sep 17 00:00:00 2001 +From ebd38fc708cf7190e47a75754235f56fa5d86300 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 23:54:35 +0200 Subject: [PATCH 06/14] configure: don't export SYSTEM_VARIABLES to .qmake.vars @@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa 1 file changed, 14 deletions(-) diff --git a/configure b/configure -index 46f7230..96c56c8 100755 +index 7f3f2f0..13dd619 100755 --- a/configure +++ b/configure @@ -581,20 +581,6 @@ fi'` @@ -39,5 +39,5 @@ index 46f7230..96c56c8 100755 mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch index b2b5ef9c..e8a7784b 100644 --- a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,4 +1,4 @@ -From 7846422a1d4ca37583fbbd10d768e34ddf84d233 Mon Sep 17 00:00:00 2001 +From 828eecd8f361cb965bd40f535435efa91665c8e5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 10:06:50 +0200 Subject: [PATCH 07/14] configure.prf: Allow to add extra arguments to make @@ -33,5 +33,5 @@ index 39144e7..de48b07 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch index eea0c343..cccf7fbe 100644 --- a/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch +++ b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch @@ -1,9 +1,12 @@ -From 9bb1bbebd644c243413650defa08a99eb4678a87 Mon Sep 17 00:00:00 2001 +From 3923edc900d1b3dd23e0a6af3a32255707cd497c Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 28 Feb 2012 15:10:24 +0000 Subject: [PATCH 08/14] configure: make pulseaudio, alsa, freetype a configurable option +Allows disabling pulseaudio, alsa, freetype support at configure time +making builds more deterministic. + Upstream-Status: Pending Signed-off-by: Paul Eggleton @@ -13,10 +16,10 @@ Signed-off-by: Martin Jansa 1 file changed, 21 insertions(+) diff --git a/configure b/configure -index 96c56c8..b3854aa 100755 +index 13dd619..66c2ae0 100755 --- a/configure +++ b/configure -@@ -1801,6 +1801,27 @@ while [ "$#" -gt 0 ]; do +@@ -1810,6 +1810,27 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; @@ -45,5 +48,5 @@ index 96c56c8..b3854aa 100755 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_QGTKSTYLE="$VAL" -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch index b35597b7..23e22a89 100644 --- a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch +++ b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch @@ -1,4 +1,4 @@ -From b70eabc4050a5e7621511403dcbf7a650b3ef9fc Mon Sep 17 00:00:00 2001 +From acbd622d1b91c1aa9ec8c48d10d91354d175345c Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 22 Jul 2013 21:09:41 +0000 Subject: [PATCH 09/14] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to @@ -15,7 +15,7 @@ Signed-off-by: Martin Jansa 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 1e00c74..a99b5bf 100644 +index 9bda70e..6e3605a 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) @@ -46,7 +46,7 @@ index 1e00c74..a99b5bf 100644 _qt5_Core_check_file_exists(${imported_location}) diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d94715..301af8f 100644 +index 1d94715..617efa8 100644 --- a/src/dbus/Qt5DBusConfigExtras.cmake.in +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) @@ -81,5 +81,5 @@ index e5650ff..16ff007 100644 _qt5_Widgets_check_file_exists(${imported_location}) -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch index 91370f17..5681b583 100644 --- a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch @@ -1,4 +1,4 @@ -From 1ea3afc37eba9ea4b1bee3916abd1bcf6abf97ba Mon Sep 17 00:00:00 2001 +From 8a10c6d053fe438aec007e4a73b60ac59716ccd4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH 10/12] Always build uic @@ -34,5 +34,5 @@ index b7887a6..8801544 100644 \ No newline at end of file +QMAKE_EXTRA_TARGETS = sub-tools -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch index 1b1d85e3..64ba88e7 100644 --- a/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch @@ -1,4 +1,4 @@ -From 96a18197ac6d9960fd00654acffd6a81bafa0320 Mon Sep 17 00:00:00 2001 +From 77a18a9fe2d0e4a1dcd95e2d78c85eb37452bc73 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 29 Oct 2012 20:07:49 -0700 Subject: [PATCH 10/14] qmake is already built in qtbase-native @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index b3854aa..15c89c7 100755 +index 66c2ae0..ac836aa 100755 --- a/configure +++ b/configure -@@ -3923,7 +3923,7 @@ setBootstrapEvalVariable() +@@ -3941,7 +3941,7 @@ setBootstrapEvalVariable() # build qmake @@ -26,5 +26,5 @@ index b3854aa..15c89c7 100755 mkdir -p "$outpath/qmake" || exit -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch index 65b65aa7..f80edbd9 100644 --- a/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,4 +1,4 @@ -From 69c6d0ccc6097da0479fddc905dd8aa69cb1d0e2 Mon Sep 17 00:00:00 2001 +From dd14f3eda61669c66c95dbcbca3afbd61f9aa746 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 29 Oct 2012 20:26:36 -0700 Subject: [PATCH 11/14] Allow building a separate qmake for the target @@ -26,5 +26,5 @@ index 89d6ea5..7c605b9 100644 VPATH += \ ../src/corelib/global \ -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch index 9335610d..798cd45e 100644 --- a/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch @@ -1,4 +1,4 @@ -From 6f42a9e1422f3aba3e2bddb8ef6d470841224ab1 Mon Sep 17 00:00:00 2001 +From 441b2ebc41013505b9f5b6a4db43526506f84e47 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 11 Nov 2013 20:22:34 -0500 Subject: [PATCH 11/12] configure: preserve built qmake and swap with native @@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 2 insertions(+) diff --git a/configure b/configure -index b3854aa..20836a6 100755 +index 66c2ae0..d423cce 100755 --- a/configure +++ b/configure -@@ -4067,6 +4067,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -4085,6 +4085,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; (cd "$outpath/qmake"; "$MAKE") || exit 2 fi # Build qmake @@ -26,5 +26,5 @@ index b3854aa..20836a6 100755 echo "Running configuration tests..." -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch index d235797d..be86f71d 100644 --- a/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch @@ -1,4 +1,4 @@ -From f9db024119ab11177629311101313cfee0fbcbc8 Mon Sep 17 00:00:00 2001 +From 63313ba681ad5bb0ef83c3b8908387939c2b41d5 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 11 Nov 2013 20:27:30 -0500 Subject: [PATCH 12/12] configure: bump path length from 256 to 512 characters @@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 20836a6..50661f4 100755 +index d423cce..1ea4102 100755 --- a/configure +++ b/configure -@@ -3805,7 +3805,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -3823,7 +3823,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; /* Installation Info */ @@ -25,5 +25,5 @@ index 20836a6..50661f4 100755 "qt_prfxpath=$QT_SYSROOT_PREFIX", "qt_docspath=$QT_SYSROOT_DOCS", -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch index 591be8e5..9d46d2fb 100644 --- a/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch +++ b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch @@ -1,4 +1,4 @@ -From 962bbe70b1f87afa820bd4cee49fcccfb6190341 Mon Sep 17 00:00:00 2001 +From 6e5e22110b4731b4324d309bc579393f422ba99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sat, 25 May 2013 17:34:32 +0200 Subject: [PATCH 12/14] qtbase: allow build of examples @@ -44,5 +44,5 @@ index 2db752c..ca1b0c7 100644 - } } -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch index 9bef55af..c6ec67cb 100644 --- a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch @@ -1,4 +1,4 @@ -From 4a169ec0dffdb2dc501533a4bca3648ba3a220bf Mon Sep 17 00:00:00 2001 +From 2fad0a6fa3c06577995ac44ed0a2a12eaef819c2 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Thu, 16 May 2013 09:52:07 +0300 Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support @@ -150,5 +150,5 @@ index 3b62d1d..a5d1f7e 100644 } else { m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); -- -1.8.5.2 +1.8.5.3 diff --git a/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch deleted file mode 100644 index 5b5d18f0..00000000 --- a/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2af1da07715288bf7fc7308e2d11aef3171c9590 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH 14/14] enables tslib device to be read from env variable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -from : -https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch - -Signed-off-by: Eric Bénard -Signed-off-by: Martin Jansa ---- - src/plugins/generic/tslib/qtslib.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp -index 6986fd5..2ed4a69 100644 ---- a/src/plugins/generic/tslib/qtslib.cpp -+++ b/src/plugins/generic/tslib/qtslib.cpp -@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key, - qDebug() << "QTsLibMouseHandler" << key << specification; - setObjectName(QLatin1String("TSLib Mouse Handler")); - -- QByteArray device = "/dev/input/event1"; -+ QByteArray device = qgetenv("TSLIB_TSDEVICE"); -+ if(device.isEmpty()) -+ device = "/dev/input/event1"; - if (specification.startsWith("/dev/")) - device = specification.toLocal8Bit(); - --- -1.8.5.2 - -- cgit v1.2.3-54-g00ecf