diff options
44 files changed, 253 insertions, 310 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index f033a20a..b946a6a6 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,5 +1,5 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.0.2", "5.0.2+git%", "5.1.0%" +# possible values now "5.0.2", "5.1.0", "5.1.0+git%" QT5_VERSION ?= "5.0.2" @@ -17,4 +17,4 @@ PREFERRED_VERSION_qtscript = "${QT5_VERSION}" PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}" PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}" -PREFERRED_VERSION_qtwayland = "${QT5_VERSION}" +PREFERRED_VERSION_qtwayland = "${QT5_VERSION}%" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 9733a489..98770472 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -10,7 +10,7 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "5.0.2+git${SRCPV}" +PV = "5.1.0+git${SRCPV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" 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 942cc9cb..5c16ece5 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From e45d617fd823f683ed426d09fd8b6edefb9517ab Mon Sep 17 00:00:00 2001 +From 14fcd5be6d0665b5803a90a1b7887943b350285f Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/15] Add linux-oe-g++ platform +Subject: [PATCH 01/23] Add linux-oe-g++ platform * This qmake.conf unlike other platforms reads most variables from shell environment, because it's easier for qt recipes to export @@ -41,10 +41,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 9c86fa1..7dea731 100755 +index 938b23b..dacfd30 100755 --- a/configure +++ b/configure -@@ -284,6 +284,16 @@ getQMakeConf() +@@ -291,6 +291,16 @@ getQMakeConf() getSingleQMakeVariable "$1" "$specvals" } @@ -61,7 +61,7 @@ index 9c86fa1..7dea731 100755 getXQMakeConf() { if [ -z "$xspecvals" ]; then -@@ -293,6 +303,16 @@ getXQMakeConf() +@@ -300,6 +310,16 @@ getXQMakeConf() getSingleQMakeVariable "$1" "$xspecvals" } @@ -78,7 +78,7 @@ index 9c86fa1..7dea731 100755 compilerSupportsFlag() { cat >conftest.cpp <<EOF -@@ -807,6 +827,18 @@ fi +@@ -816,6 +836,18 @@ fi # initalize variables #------------------------------------------------------------------------------- @@ -97,7 +97,7 @@ index 9c86fa1..7dea731 100755 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" for varname in $SYSTEM_VARIABLES; do qmakevarname="${varname}" -@@ -2847,7 +2879,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then +@@ -2894,7 +2926,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then CFG_QGTKSTYLE=no fi @@ -106,7 +106,7 @@ index 9c86fa1..7dea731 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -2882,7 +2914,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -2929,7 +2961,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then exit 1 fi fi @@ -115,7 +115,7 @@ index 9c86fa1..7dea731 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3884,6 +3916,14 @@ setBootstrapVariable() +@@ -3967,6 +3999,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" } @@ -130,7 +130,7 @@ index 9c86fa1..7dea731 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3922,11 +3962,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -4005,11 +4045,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.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch index a0810bcc..e02815b1 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch @@ -1,4 +1,4 @@ -From ebe1148e38c5deb3c67dc041e68cd1623531d67b Mon Sep 17 00:00:00 2001 +From a911109ed920e6a7466b65df86270ed836dd529c Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa <mikko.levonmaa@palm.com> Date: Tue, 27 Nov 2012 12:46:44 -0800 Subject: [PATCH] Always build uic @@ -36,5 +36,5 @@ index b4c9602..f30ec1f 100644 nacl: SUBDIRS -= src_network src_testlib -- -1.8.2.1 +1.8.3.2 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 e1087f2a..9f301c46 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,7 +1,7 @@ -From 4da4d9606efc8d3109296906e5b13814499ae698 Mon Sep 17 00:00:00 2001 +From 64ac02980780a099618b8d47803a1e4da6016c84 Mon Sep 17 00:00:00 2001 From: Holger Freyther <zecke@selfish.org> Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/15] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/23] qlibraryinfo: allow to set qt.conf from the outside using the environment Allow to set a qt.conf from the outside using the environment. This allows @@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 5fb9640..6b40731 100644 +index 53a3ebb..8ca2102 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() @@ -32,5 +32,5 @@ index 5fb9640..6b40731 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -1.8.2.1 +1.8.3.2 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 0b98683e..b80189f3 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,7 +1,7 @@ -From c9bf00e21ae398575adf4411e67b35cdf44920e5 Mon Sep 17 00:00:00 2001 +From 6e92a3eac477a534226f916018a6ba6996eff318 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/15] Add -external-hostbindir option +Subject: [PATCH 03/23] Add -external-hostbindir option * when cross-compiling it's sometimes useful to use existing tools from machine (or in OpenEmbedded built with separate native recipe) when building for target @@ -12,40 +12,39 @@ Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - configure | 15 ++++++++++++++- + configure | 14 ++++++++++++++ mkspecs/features/qt_functions.prf | 5 ++++- mkspecs/features/qt_tool.prf | 2 +- qmake/property.cpp | 1 + - qtbase.pro | 15 +++++++++++---- + qtbase.pro | 12 +++++++++--- src/corelib/global/qlibraryinfo.cpp | 3 ++- src/corelib/global/qlibraryinfo.h | 1 + tools/configure/configureapp.cpp | 8 ++++++++ - 8 files changed, 42 insertions(+), 8 deletions(-) + 8 files changed, 40 insertions(+), 6 deletions(-) diff --git a/configure b/configure -index 7dea731..65f4d26 100755 +index dacfd30..25980c0 100755 --- a/configure +++ b/configure -@@ -1034,6 +1034,7 @@ CFG_GCC_SYSROOT="yes" - QT_HOST_PREFIX= +@@ -1046,6 +1046,7 @@ QT_HOST_PREFIX= QT_HOST_BINS= + QT_HOST_LIBS= QT_HOST_DATA= +QT_EXTERNAL_HOST_BINS= #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -1141,7 +1142,7 @@ while [ "$#" -gt 0 ]; do - VAL=no - ;; - #Qt style options that pass an argument -- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version) -+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version|-external-hostbindir) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL="$1" -@@ -1326,6 +1327,9 @@ while [ "$#" -gt 0 ]; do - hostbindir) - QT_HOST_BINS="$VAL" +@@ -1170,6 +1171,7 @@ while [ "$#" -gt 0 ]; do + -testsdir| \ + -hostdatadir| \ + -hostbindir| \ ++ -external-hostbindir| \ + -hostlibdir| \ + -sysroot| \ + -depths| \ +@@ -1379,6 +1381,9 @@ while [ "$#" -gt 0 ]; do + hostlibdir) + QT_HOST_LIBS="$VAL" ;; + external-hostbindir) + QT_EXTERNAL_HOST_BINS="$VAL" @@ -53,8 +52,8 @@ index 7dea731..65f4d26 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -3180,6 +3184,11 @@ else - QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` +@@ -3248,6 +3253,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" fi +# default is empty, don't call makeabs if it is empty @@ -65,7 +64,7 @@ index 7dea731..65f4d26 100755 #------------------------------------------------------------------------------- # help - interactive parts of the script _after_ this section please #------------------------------------------------------------------------------- -@@ -3346,6 +3355,9 @@ Installation options: +@@ -3416,6 +3426,9 @@ Installation options: -hostdatadir <dir> . Data used by qmake will be installed to <dir> (default HOSTPREFIX) @@ -75,32 +74,32 @@ index 7dea731..65f4d26 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -3855,6 +3867,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { - "qt_hpfxpath=$QT_HOST_PREFIX", +@@ -3931,6 +3944,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", + "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", "qt_targspec=$shortxspec", "qt_hostspec=$shortspec", #endif diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 8cd2473..876f657 100644 +index 2f2c94c..4e12d3d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -193,7 +193,10 @@ defineTest(qtAddRpathLink) { +@@ -194,7 +194,10 @@ defineTest(qtAddRpathLink) { defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) + $$1 = $$eval(QT_TOOL.$${2}.binary) isEmpty($$1) { - $$1 = $$[QT_HOST_BINS]/$$2 + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 + isEmpty($$[QT_EXTERNAL_HOST_BINS]) { + $$1 = $$[QT_HOST_BINS]/$$2 + } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { - exists($$eval($$1).bat) { - $$1 = $$eval($$1).bat + exists($$eval($$1).pl) { + $$1 = perl -w $$eval($$1).pl + } else: contains(QMAKE_HOST.os, Windows) { diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 0a58880..c110ea5 100644 +index 9a6b963..83ef3a0 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -16,7 +16,7 @@ CONFIG += console @@ -111,24 +110,24 @@ index 0a58880..c110ea5 100644 +!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { isEmpty(MODULE):MODULE = $$TARGET - MODULE_DEPENDS = $$replace(QT, -private$, ) + !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) diff --git a/qmake/property.cpp b/qmake/property.cpp -index c4fbcd6..c1b7a9f 100644 +index 4685440..93eb1d4 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp -@@ -74,6 +74,7 @@ static const struct { - { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, +@@ -75,6 +75,7 @@ static const struct { { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, + { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, + { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/qtbase.pro b/qtbase.pro -index 4c41cff..997ea6d 100644 +index d6726b5..28ca7d5 100644 --- a/qtbase.pro +++ b/qtbase.pro -@@ -68,17 +68,24 @@ CONFIG -= qt +@@ -70,16 +70,22 @@ CONFIG -= qt #qmake qmake.path = $$[QT_HOST_BINS] @@ -146,19 +145,16 @@ index 4c41cff..997ea6d 100644 #syncqt syncqt.path = $$[QT_HOST_BINS] - syncqt.files = $$PWD/bin/syncqt --equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat + syncqt.files = $$PWD/bin/syncqt.pl ++syncqt.files = $$PWD/bin/syncqt.pl +!isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt -+} -+equals(QMAKE_HOST.os, Windows) { -+ syncqt.files = $${syncqt.files}.bat ++ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl +} INSTALLS += syncqt # If we are doing a prefix build, create a "module" pri which enables diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 6b40731..139a60f 100644 +index 8ca2102..9f5d444 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() @@ -170,31 +166,31 @@ index 6b40731..139a60f 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -295,6 +295,7 @@ static const struct { - { "HostPrefix", "" }, +@@ -296,6 +296,7 @@ static const struct { { "HostBinaries", "bin" }, + { "HostLibraries", "lib" }, { "HostData", "." }, + { "ExternalHostBinaries", "" }, { "TargetSpec", "" }, { "HostSpec", "" }, #endif diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h -index 1a00a14..7e4829c 100644 +index b275e01..0e6baed 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h -@@ -83,6 +83,7 @@ public: - HostPrefixPath, +@@ -84,6 +84,7 @@ public: HostBinariesPath, + HostLibrariesPath, HostDataPath, + ExternalHostBinariesPath, TargetSpecPath, HostSpecPath, LastHostPath = HostSpecPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index a18aac3..57409b1 100644 +index 5b62e8f..c752df3 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -1173,6 +1173,13 @@ void Configure::parseCmdLine() +@@ -1162,6 +1162,13 @@ void Configure::parseCmdLine() dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i); } @@ -208,14 +204,14 @@ index a18aac3..57409b1 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -3775,6 +3782,7 @@ void Configure::generateQConfigCpp() - << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl +@@ -3715,6 +3722,7 @@ void Configure::generateQConfigCpp() << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl + << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl + << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl << " \"qt_targspec=" << targSpec << "\"," << endl << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch index 77b1c41f..ccb8a093 100644 --- a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -1,7 +1,7 @@ -From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001 +From 1e0f35bd94719f77f7be5e059e72a51576b6f94b Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 04/15] qt_functions: temporary remove isEmpty check +Subject: [PATCH 04/23] qt_functions: temporary remove isEmpty check * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value * isEmpty works correctly only with qmake variables (e.g. $$FOO - @@ -16,11 +16,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 876f657..0e094a8 100644 +index 4e12d3d..e20ad9d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) +@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.binary) isEmpty($$1) { $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 - isEmpty($$[QT_EXTERNAL_HOST_BINS]) { @@ -31,9 +31,9 @@ index 876f657..0e094a8 100644 + !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { $$1 = $$[QT_HOST_BINS]/$$2 } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { + exists($$eval($$1).pl) { diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index c110ea5..34ee9ca 100644 +index 83ef3a0..21c9eb7 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -15,8 +15,7 @@ CONFIG += console @@ -45,7 +45,7 @@ index c110ea5..34ee9ca 100644 +!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { isEmpty(MODULE):MODULE = $$TARGET - MODULE_DEPENDS = $$replace(QT, -private$, ) + !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch index d95e0b45..7bd2ba6b 100644 --- a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch +++ b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch @@ -1,7 +1,7 @@ -From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001 +From 33e87dae3b9dc4007c7cddd82a1b9058010a1992 Mon Sep 17 00:00:00 2001 From: Michael Krelin <hacker@klever.net> Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 05/15] qmake is already built in qtbase-native +Subject: [PATCH 05/23] qmake is already built in qtbase-native Ported from OE by: Yu Ke <ke.yu@intel.com> Upstream-Status: Inappropriate [configuration] @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 65f4d26..dbf99a9 100755 +index 25980c0..74f9e65 100755 --- a/configure +++ b/configure -@@ -3938,7 +3938,7 @@ setBootstrapEvalVariable() +@@ -4022,7 +4022,7 @@ setBootstrapEvalVariable() # build qmake @@ -26,5 +26,5 @@ index 65f4d26..dbf99a9 100755 mkdir -p "$outpath/qmake" || exit -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch index a8778469..d074c3da 100644 --- a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -1,7 +1,7 @@ -From 8be64919365240728dcce02fac44e5018aaec191 Mon Sep 17 00:00:00 2001 +From 6007028a92806a0fd0683f539dba178ad33ab87d Mon Sep 17 00:00:00 2001 From: Paul Eggleton <paul.eggleton@linux.intel.com> Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 06/15] Allow building a separate qmake for the target +Subject: [PATCH 06/23] Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+) diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 0d92ac2..9be0e9b 100644 +index a81d0cd..ed7aebf 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro -@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic +@@ -8,6 +8,7 @@ CONFIG -= qt shared app_bundle uic DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ PROEVALUATOR_FULL PROEVALUATOR_DEBUG DESTDIR = ../bin/ @@ -25,5 +25,5 @@ index 0d92ac2..9be0e9b 100644 OBJECTS_DIR = . MOC_DIR = . -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index f873aae9..4562fe15 100644 --- a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -1,7 +1,7 @@ -From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e Mon Sep 17 00:00:00 2001 +From bd192d0261e39765d895446e9d914a68a0590365 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 07/15] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 07/23] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT Upstream-Status: Pending @@ -10,10 +10,10 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 57409b1..f443007 100644 +index c752df3..0d1bca6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -3172,8 +3172,8 @@ void Configure::generateQConfigPri() +@@ -3118,8 +3118,8 @@ void Configure::generateQConfigPri() configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { // FIXME: add detection @@ -25,5 +25,5 @@ index 57409b1..f443007 100644 if (dictionary["QT_EDITION"].contains("OPENSOURCE")) configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch index 4d15ee06..f855292c 100644 --- a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ -From 1ac376893b75c36cc1ee6465e814546e2215354e Mon Sep 17 00:00:00 2001 +From 5168edad24f2c27061286707603bc2126365bcb2 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 08/15] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm @@ -23,14 +23,14 @@ Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - mkspecs/features/qt_module.prf | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) + mkspecs/features/qt_module.prf | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 3531d28..1c43972 100644 +index 7f7de85..7741b96 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -136,18 +136,30 @@ unix|win32-g++* { +@@ -140,18 +140,30 @@ unix|win32-g++* { rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* else: \ rplbase = $$MODULE_BASE_OUTDIR @@ -41,8 +41,9 @@ index 3531d28..1c43972 100644 include_replace.match = $$rplbase/include include_replace.replace = $$[QT_INSTALL_HEADERS/raw] lib_replace.match = $$rplbase/lib - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR - QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] + lafile_replace.match = $$rplbase + lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" + @@ -57,12 +58,13 @@ index 3531d28..1c43972 100644 unix { CONFIG += create_libtool explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] +- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR - QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace -+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace ++ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] ++ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace } unix|win32-g++* { -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch index 8a3ef3c1..c1e80bc2 100644 --- a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch +++ b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -1,7 +1,7 @@ -From 111583f7a46871d130ac1c6688972ebf98452af4 Mon Sep 17 00:00:00 2001 +From fdd0a04cca9cb991b7073d01312218d3387c1e43 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 09/15] qt_module: Fix paths in .prl files +Subject: [PATCH 09/23] qt_module: Fix paths in .prl files * qmake does not prefix them with QT_SYSROOT when using them so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE @@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 1c43972..feec2d5 100644 +index 7741b96..3874067 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -140,17 +140,23 @@ unix|win32-g++* { +@@ -144,17 +144,23 @@ unix|win32-g++* { pkgconfig_include_replace.replace = "\$$\\{includedir}" pkgconfig_lib_replace.match = $$rplbase/lib pkgconfig_lib_replace.replace = "\$$\\{libdir}" @@ -58,5 +58,5 @@ index 1c43972..feec2d5 100644 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch index 5b14c818..749edeee 100644 --- a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch +++ b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch @@ -1,7 +1,7 @@ -From 1224e23a7990ac877265a2736827a98c300a8bf7 Mon Sep 17 00:00:00 2001 +From 346e27a30ee7e480c5bdb789d12aa41e8e2efad5 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 10/15] wayland-scanner: disable silent rules +Subject: [PATCH 10/23] wayland-scanner: disable silent rules * for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands @@ -78,5 +78,5 @@ index 2ec064f..847d0f7 100644 +#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands QMAKE_EXTRA_COMPILERS += qtwayland-server-code -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch index 2c2360e6..6117e7fb 100644 --- a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -1,7 +1,7 @@ -From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001 +From df07d747bdbb5652165a3c9395247729a4bf2fce Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 11/15] configure: don't export SYSTEM_VARIABLES to .qmake.vars +Subject: [PATCH 11/23] configure: don't export SYSTEM_VARIABLES to .qmake.vars * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is causing issues as we need g++ to be used as linker @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure b/configure -index dbf99a9..9ca23a4 100755 +index 74f9e65..7a9a77c 100755 --- a/configure +++ b/configure -@@ -840,20 +840,7 @@ fi'` +@@ -849,20 +849,7 @@ fi'` done SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" @@ -40,5 +40,5 @@ index dbf99a9..9ca23a4 100755 mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch index e6602b43..e0a21667 100644 --- a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -1,7 +1,7 @@ -From 7389b5556de11258d3084ede10c12859353fb13b Mon Sep 17 00:00:00 2001 +From e72d6d0528bb0032dddfbdb01a232f62e5931ba8 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 12/15] configure.prf: Allow to add extra arguments to make +Subject: [PATCH 12/23] configure.prf: Allow to add extra arguments to make * sometimes we would like to add -e or define some variable and respect it from both Makefiles used in configure tests and also Makefiles to build the application @@ -33,5 +33,5 @@ index b4569df..d189e50 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch index cd0c0596..32982662 100644 --- a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch +++ b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch @@ -1,7 +1,7 @@ -From c3e47eeb4dec8348c3a9f2cf9044c568c5334070 Mon Sep 17 00:00:00 2001 +From 4d9e581943ed3a7440e8176ab81c82fe949ae300 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa <mikko.levonmaa@palm.com> Date: Tue, 8 Jan 2013 15:58:29 -0800 -Subject: [PATCH 13/15] Disable mkv8snapshot +Subject: [PATCH 13/23] Disable mkv8snapshot It seems to generate code that throws SIGILL, so disabling it @@ -30,11 +30,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 9ca23a4..96965b6 100755 +index 7a9a77c..69e30b5 100755 --- a/configure +++ b/configure -@@ -899,7 +899,7 @@ CFG_NOBUILD_PARTS="" - CFG_SKIP_MODULES="" +@@ -910,7 +910,7 @@ CFG_SKIP_MODULES="" + CFG_COMPILE_EXAMPLES=auto CFG_RELEASE_QMAKE=no CFG_AUDIO_BACKEND=auto -CFG_V8SNAPSHOT=auto @@ -43,5 +43,5 @@ index 9ca23a4..96965b6 100755 CFG_JAVASCRIPTCORE_JIT=auto CFG_PKGCONFIG=auto -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch index e55ac7a3..a2dc5fb8 100644 --- a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch +++ b/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch @@ -1,7 +1,7 @@ -From 8d037dfbe0b9cffa098c3de7010651590c1d6e6c Mon Sep 17 00:00:00 2001 +From 99c5a9d546a37e244bfc12b0aa134fccd31905b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> Date: Mon, 27 May 2013 18:32:37 +0200 -Subject: [PATCH 14/15] enables tslib device to be read from env variable +Subject: [PATCH 14/23] enables tslib device to be read from env variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -31,5 +31,5 @@ index 6986fd5..2ed4a69 100644 device = specification.toLocal8Bit(); -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch index 45a49a62..9cf06419 100644 --- a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch +++ b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch @@ -1,7 +1,7 @@ -From 3d83f570e081e23a6cf6d0ccf57ad8db34c5ca3e Mon Sep 17 00:00:00 2001 +From 1936e953e2273c204230c931c0b86b34107340c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> Date: Sat, 25 May 2013 17:34:32 +0200 -Subject: [PATCH 15/15] qtbase: allow build of examples +Subject: [PATCH 15/23] qtbase: allow build of examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -24,20 +24,19 @@ Date: Fri Dec 21 19:36:12 2012 +0100 Signed-off-by: Eric Bénard <eric@eukrea.com> --- - mkspecs/features/qt_example_installs.prf | 8 -------- - 1 file changed, 8 deletions(-) + mkspecs/features/qt_example_installs.prf | 7 ------- + 1 file changed, 7 deletions(-) diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 479a16a..ca1b0c7 100644 +index 2db752c..ca1b0c7 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf -@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) +@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) allfiles -= doc !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") } - -- # Do not actually build the examples in production builds with -prefix -- !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) { +- !equals(TEMPLATE, subdirs):!compile_examples { - TEMPLATE = aux - CONFIG -= have_target qt staticlib dll - SOURCES = @@ -45,5 +44,5 @@ index 479a16a..ca1b0c7 100644 - } } -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch index 9d581f82..e26d237f 100644 --- a/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch @@ -1,7 +1,7 @@ -From 2efd051d3093ee4e4091a8947f28d9bd528f2e9e Mon Sep 17 00:00:00 2001 +From b485950725b776bc1f0cf4edd5330d61732262cb Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <jani.hautakangas@ixonos.com> Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH] QOpenGLPaintDevice sub-area support +Subject: [PATCH 18/23] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer. @@ -9,12 +9,14 @@ of binded framebuffer. Upstream-Status: Pending Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80 + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ - src/gui/opengl/qopenglpaintdevice.h | 2 ++ - src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++--- - src/gui/opengl/qopenglpaintengine_p.h | 1 + - src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- + src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ + src/gui/opengl/qopenglpaintdevice.h | 2 ++ + src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++--- + src/gui/opengl/qopenglpaintengine_p.h | 1 + + src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp @@ -74,10 +76,10 @@ index c05571c..01eb1bc 100644 void setSize(const QSize &size); void setDevicePixelRatio(qreal devicePixelRatio); diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp -index 0782e42..52afc60 100644 +index 78f5080..20db620 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -1978,7 +1978,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) +@@ -2004,7 +2004,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) d->vertexAttributeArraysEnabledState[i] = false; @@ -88,7 +90,7 @@ index 0782e42..52afc60 100644 d->width = sz.width(); d->height = sz.height(); d->mode = BrushDrawingMode; -@@ -2066,7 +2069,7 @@ void QOpenGL2PaintEngineEx::ensureActive() +@@ -2092,7 +2095,7 @@ void QOpenGL2PaintEngineEx::ensureActive() d->device->ensureActiveTarget(); d->transferMode(BrushDrawingMode); @@ -97,7 +99,7 @@ index 0782e42..52afc60 100644 d->needsSync = false; d->lastMaskTextureUsed = 0; d->shaderManager->setDirty(); -@@ -2109,6 +2112,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2135,6 +2138,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() if (bounds == QRect(0, 0, width, height)) { glDisable(GL_SCISSOR_TEST); } else { @@ -105,7 +107,7 @@ index 0782e42..52afc60 100644 glEnable(GL_SCISSOR_TEST); setScissor(bounds); } -@@ -2117,14 +2121,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2143,14 +2147,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) { @@ -135,11 +137,11 @@ index d51f0e5..0d4b38d 100644 QOpenGLContext *ctx; EngineMode mode; diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 83f4075..ec29900 100644 +index 7d49c03..d9eb3fe 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -268,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); +@@ -271,7 +271,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) + funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); if (pex != 0) { - glViewport(0, 0, pex->width, pex->height); @@ -148,5 +150,5 @@ index 83f4075..ec29900 100644 } else { m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); -- -1.7.9.5 +1.8.3.2 diff --git a/recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch deleted file mode 100644 index 96b0a71a..00000000 --- a/recipes-qt/qt5/qtbase-git/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch +++ /dev/null @@ -1,48 +0,0 @@ -From dd2a427857612798071d3f8c23286322654669d6 Mon Sep 17 00:00:00 2001 -From: Valery Volgutov <valery.volgutov@lge.com> -Date: Tue, 21 May 2013 12:02:19 -0700 -Subject: [PATCH] Fix FBO restoring in QOpenGLTextureGlyphCache - -QOpenGLTextureGlyphCache::restoreTextureData restores FBO which -was binded before restoreTextureData call. More specifically, -it restores QOpenGLContextPrivate's current_fbo member. This works -if FBO was binded by QOpenGLFramebufferObject but not if FBO was -binded using glBindFramebufferObject and rendering done via -QOpenGLPaintDevice. - -This patch fixes it by querying current FBO using -GL_FRAMEBUFFER_BINDING query and restoring it. - -Upstream-Status: Backport -https://codereview.qt-project.org/#change,56608 - ---- - src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 4e20f6a..3e66bad 100644 ---- a/src/gui/opengl/qopengltextureglyphcache.cpp -+++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - return; - } - -+ GLuint saveFbo; -+ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo); -+ - int oldWidth = m_textureResource->m_width; - int oldHeight = m_textureResource->m_height; - -@@ -265,7 +268,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) - glDeleteTextures(1, &tmp_texture); - glDeleteTextures(1, &oldTexture); - -- funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); -+ funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo); - - if (pex != 0) { - glViewport(0, 0, pex->width, pex->height); --- -1.7.9.5 - diff --git a/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch index a3543077..5919bbad 100644 --- a/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch +++ b/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch @@ -1,17 +1,19 @@ -From 9108a53309ae584d6622881b418742a9213cb9f1 Mon Sep 17 00:00:00 2001 +From 893bf856c5f61c75cd9a2c44dff911f31db261e1 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <jani.hautakangas@ixonos.com> Date: Mon, 27 May 2013 15:25:25 -0700 -Subject: [PATCH] Use BGRA extension in bindTexture +Subject: [PATCH 20/23] Use BGRA extension in bindTexture Upstream-Status: Pending Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1 + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - src/gui/opengl/qopengltexturecache.cpp | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) + src/gui/opengl/qopengltexturecache.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp -index 94b8288..45aad1f 100644 +index 94b8288..5c8aa3c 100644 --- a/src/gui/opengl/qopengltexturecache.cpp +++ b/src/gui/opengl/qopengltexturecache.cpp @@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con @@ -28,4 +30,5 @@ index 94b8288..45aad1f 100644 int cost = tx.width() * tx.height() * 4 / 1024; m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost); -- -1.7.9.5 +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch index 2fe0a182..f259284c 100644 --- a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch +++ b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch @@ -1,4 +1,4 @@ -From 1f5a36de9bb01192d3cdbcbef7a009ab4651040b Mon Sep 17 00:00:00 2001 +From f6156776d191b9d848d6892c473dfa2cd8963884 Mon Sep 17 00:00:00 2001 From: Paul Eggleton <paul.eggleton@linux.intel.com> Date: Tue, 28 Feb 2012 15:10:24 +0000 Subject: [PATCH 21/23] configure: make pulseaudio a configurable option @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 96965b6..595c9d9 100755 +index 69e30b5..290b9ac 100755 --- a/configure +++ b/configure -@@ -1959,6 +1959,13 @@ while [ "$#" -gt 0 ]; do +@@ -2039,6 +2039,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; diff --git a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch index 76d1400c..3513a171 100644 --- a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch +++ b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch @@ -1,4 +1,4 @@ -From eb93499e26486957a93b2f8f82853d3de9769cce Mon Sep 17 00:00:00 2001 +From 39dc112aa81a9e658fa00e1fc88ed3f712b4687a Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Fri, 19 Jul 2013 23:21:28 +0200 Subject: [PATCH 22/23] configure: make alsa a configurable option @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 595c9d9..864967c 100755 +index 290b9ac..5e9bfd4 100755 --- a/configure +++ b/configure -@@ -1966,6 +1966,13 @@ while [ "$#" -gt 0 ]; do +@@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; diff --git a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch index 76b58355..f141725f 100644 --- a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch +++ b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch @@ -1,4 +1,4 @@ -From 6729c056b4d3ab43e59ce1c8303ae58d7c6ba8cf Mon Sep 17 00:00:00 2001 +From 059904ca921dfbdc9d702be67dcce66957ef6ecd Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 20 Jul 2013 10:56:37 +0200 Subject: [PATCH 23/23] configure: make freetype a configurable option @@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 7 insertions(+) diff --git a/configure b/configure -index 864967c..1b4225a 100755 +index 5e9bfd4..5b1f5f2 100755 --- a/configure +++ b/configure -@@ -1973,6 +1973,13 @@ while [ "$#" -gt 0 ]; do +@@ -2053,6 +2053,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 71177825..0db74da8 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -1,6 +1,10 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" +do_install_append() { + # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) + # e.g. qt3d, qtjsondb, qtwayland + ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt +} -SRCREV = "4d6572aac0eb1f75f3c810ce8e92635b956d29fc" +SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f4cce29f..0e091235 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -17,7 +17,6 @@ SRC_URI += " \ file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ file://0015-qtbase-allow-build-of-examples.patch \ file://0018-QOpenGLPaintDevice-sub-area-support.patch \ - file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \ file://0020-Use-BGRA-extension-in-bindTexture.patch \ file://0021-configure-make-pulseaudio-a-configurable-option.patch \ file://0022-configure-make-alsa-a-configurable-option.patch \ diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index c2cd97b6..15ac3718 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -6,6 +6,7 @@ PR = "${INC_PR}.0" SRC_URI += " \ file://0016-Allow-tslib-to-be-specified-at-configure-time.patch \ file://0017-Rename-qAbs-Function-for-timeval.patch \ + file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \ " SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" diff --git a/recipes-qt/qt5/qtbase_5.1.0.bb b/recipes-qt/qt5/qtbase_5.1.0.bb index b5554641..54e2da94 100644 --- a/recipes-qt/qt5/qtbase_5.1.0.bb +++ b/recipes-qt/qt5/qtbase_5.1.0.bb @@ -1,5 +1,9 @@ require qt5-${PV}.inc require ${PN}.inc +SRC_URI += " \ + file://0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch \ +" + SRC_URI[md5sum] = "0f8d14bb4039a2996c501a376ca7dae0" SRC_URI[sha256sum] = "1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 71177825..2994d3fa 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "4d6572aac0eb1f75f3c810ce8e92635b956d29fc" +SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a" diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch new file mode 100644 index 00000000..7a68dd53 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch @@ -0,0 +1,46 @@ +From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> +Date: Sun, 26 May 2013 14:26:19 +0200 +Subject: [PATCH 1/3] qmltestexample: fix link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +else we get : +ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found + +Upstream-Status: Inappropriate + +Signed-off-by: Eric Bénard <eric@eukrea.com> +--- + examples/qmltest/qmltest/qmltest.pro | 2 +- + tools/qmltestrunner/qmltestrunner.pro | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro +index b5893c5..1b00e6c 100644 +--- a/examples/qmltest/qmltest/qmltest.pro ++++ b/examples/qmltest/qmltest/qmltest.pro +@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml + # This code exists solely for the purpose of building this example + # inside the examples/ hierarchy. + +-QT += qml qmltest ++QT += qml qmltest quick + + macx: CONFIG -= app_bundle + +diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro +index 5184c1f..668cf17 100644 +--- a/tools/qmltestrunner/qmltestrunner.pro ++++ b/tools/qmltestrunner/qmltestrunner.pro +@@ -1,5 +1,5 @@ + SOURCES += main.cpp + +-QT += qml qmltest ++QT += qml qmltest quick + + load(qt_tool) +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch b/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch deleted file mode 100644 index a61f8de2..00000000 --- a/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b47cfc601cf5d3c67289f72f43293846371993e2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> -Date: Mon, 3 Jun 2013 13:40:09 +0200 -Subject: [PATCH 2/2] Fix null-pointer access in QQuickVisualDataModelPrivate - -I observed null cachItem->contextData which lead to null-pointer access -on cacheItem->contextData->destroy(). - -Task-number: QTBUG-31439 - -Upstream-Status: Backport https://codereview.qt-project.org/57789 - -Signed-of-by: Florian Haenel <florian.haenel@lge.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - -Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3 ---- - src/qml/types/qqmldelegatemodel.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp -index 16572c4..f457538 100644 ---- a/src/qml/types/qqmldelegatemodel.cpp -+++ b/src/qml/types/qqmldelegatemodel.cpp -@@ -835,7 +835,8 @@ void QQmlDelegateModelPrivate::incubatorStatusChanged(QQDMIncubationTask *incuba - delete cacheItem->object; - cacheItem->object = 0; - cacheItem->scriptRef -= 1; -- cacheItem->contextData->destroy(); -+ if (cacheItem->contextData) -+ cacheItem->contextData->destroy(); - cacheItem->contextData = 0; - - if (!cacheItem->isReferenced()) { --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch index 5f201f97..84f8f661 100644 --- a/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch +++ b/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch @@ -1,7 +1,7 @@ -From b93b61260b8eda33c01cef542777efbae2e8c570 Mon Sep 17 00:00:00 2001 +From 3919fe89e7adbc9f163eabce9269a924273c64ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> Date: Wed, 5 Jun 2013 19:23:32 +0200 -Subject: [PATCH 1/2] Fix wrong calculation of viewPort for transitions +Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions Viewport is calculated wrong for horizontal layout in a second instance @@ -24,7 +24,7 @@ Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp -index d774091..aa489eb 100644 +index a6dabee..290f283 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() @@ -37,5 +37,5 @@ index d774091..aa489eb 100644 it != releasePendingTransition.end(); ) { FxViewItem *item = *it; -- -1.8.2.1 +1.8.3.2 diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index e1418db5..407dd886 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -1,10 +1,9 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRC_URI += "file://0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ - file://0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch \ +SRC_URI += " \ + file://0001-qmltestexample-fix-link.patch \ + file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ " -SRCREV = "1d594c4e10caa9258f00bb7bcf61c307d027633b" +SRCREV = "672354676d8e968e2523d1aeb450213a46b8b27c" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 19921487..3f0f8790 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "bd434a6ea358e96c373e3ad65bfb6d939904abf5" +SRCREV = "94ba2a255c4ca7f07e024c9dedf5547f371fd3a2" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 08f9bd3e..1bb88ae0 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "f293cc8539da5d4ea915c957abbba473515793ad" +SRCREV = "a196fc62304ae23e68f60ae85a6106692f419f98" diff --git a/recipes-qt/qt5/qtjsbackend-native_git.bb b/recipes-qt/qt5/qtjsbackend-native_git.bb index f825b993..29e97c49 100644 --- a/recipes-qt/qt5/qtjsbackend-native_git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "c97afb08eb28ce36f726fe427556622790a287c1" +SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832" diff --git a/recipes-qt/qt5/qtjsbackend_git.bb b/recipes-qt/qt5/qtjsbackend_git.bb index f825b993..29e97c49 100644 --- a/recipes-qt/qt5/qtjsbackend_git.bb +++ b/recipes-qt/qt5/qtjsbackend_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "c97afb08eb28ce36f726fe427556622790a287c1" +SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 207424b9..d1eced6c 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "07f20b8afe6976d69359c27278cbda2c4d0a47c7" +SRCREV = "c74b544610376c753ea0a29ff2465e2bcfe70e1d" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 717a9999..1d4a7253 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "31c3dec9fe1341d412830eb1163e252112f9765c" +SRCREV = "cb9d1a61b127030562a206c0142d99997eb82c8e" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index ceccb971..4328b583 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "15f8b3a5f8623d5230865e2fd9811c986a91f7e6" +SRCREV = "a8e3602554c3225046a831cad7a727a56501439b" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 7d3e7663..7d082a1d 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -1,9 +1,4 @@ require qt5-git.inc require ${PN}.inc -# qtsensors wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -PV = "4.999+5.0.0-beta1+git${SRCPV}" - -PR = "${INC_PR}.0" - -SRCREV = "a8bb2b1720372b79b1e7c03692252a3d6f0a7c0f" +SRCREV = "0862901b142f36e91b98dbdcb2c36585020bb33d" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 735c3446..fef5ecdb 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "04959ec43e93877348c41ff1d36916993948e43d" +SRCREV = "a29af8f024c8fb4bfdf1ce9e6c03387c3abcaffa" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 1b0737a7..ebfc56c7 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "a2e31061d4a24fceb4d32f4df301150ee1cc8af1" +SRCREV = "c31ff44d3a17fab37754acb2a0a29cd6eba10699" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 1277e346..e824b8e7 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -PR = "${INC_PR}.0" - -SRCREV = "3ca482d01c07ee25213533b31a3ad626c224d95e" +SRCREV = "808c59c00f23109d1887022c2d9a6f4e5ecc72a4" |