qt5: Add Qt 5.3.2 packages
PATCH 1/4 qt5: Add Qt 5.3.2 packages
From: coldnew <[email protected]>
Qt 5.3.2 has been released in September 16th, 2014.
Signed-off-by Yen-Chin Lee <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
conf/distro/include/qt5-versions.inc | 4 ++--
recipes-qt/qt5/nativesdk-qtbase_5.3.1.bb | 5 -----
recipes-qt/qt5/nativesdk-qtbase_5.3.2.bb | 5 +++++
recipes-qt/qt5/nativesdk-qttools_5.3.1.bb | 5 -----
recipes-qt/qt5/nativesdk-qttools_5.3.2.bb | 5 +++++
recipes-qt/qt5/{qt5-5.3.1.inc => qt5-5.3.2.inc} | 0
recipes-qt/qt5/{qtbase-native_5.3.1.bb => qtbase-native_5.3.2.bb} | 4 ++--
recipes-qt/qt5/qtbase_5.3.1.bb | 5 -----
recipes-qt/qt5/qtbase_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtconnectivity_5.3.1.bb | 5 -----
recipes-qt/qt5/qtconnectivity_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtdeclarative_5.3.1.bb | 5 -----
recipes-qt/qt5/qtdeclarative_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtenginio_5.3.1.bb | 5 -----
recipes-qt/qt5/qtenginio_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtgraphicaleffects_5.3.1.bb | 5 -----
recipes-qt/qt5/qtgraphicaleffects_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtimageformats_5.3.1.bb | 5 -----
recipes-qt/qt5/qtimageformats_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtlocation_5.3.1.bb | 5 -----
recipes-qt/qt5/qtlocation_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtmultimedia_5.3.1.bb | 5 -----
recipes-qt/qt5/qtmultimedia_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtquick1_5.3.1.bb | 5 -----
recipes-qt/qt5/qtquick1_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtquickcontrols_5.3.1.bb | 5 -----
recipes-qt/qt5/qtquickcontrols_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtscript_5.3.1.bb | 5 -----
recipes-qt/qt5/qtscript_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtsensors_5.3.1.bb | 5 -----
recipes-qt/qt5/qtsensors_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtserialport_5.3.1.bb | 5 -----
recipes-qt/qt5/qtserialport_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtsvg_5.3.1.bb | 5 -----
recipes-qt/qt5/qtsvg_5.3.2.bb | 5 +++++
recipes-qt/qt5/qttools-native_5.3.1.bb | 5 -----
recipes-qt/qt5/qttools-native_5.3.2.bb | 5 +++++
recipes-qt/qt5/qttools_5.3.1.bb | 5 -----
recipes-qt/qt5/qttools_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtwebkit-examples_5.3.1.bb | 5 -----
recipes-qt/qt5/qtwebkit-examples_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtwebkit_5.3.1.bb | 5 -----
recipes-qt/qt5/qtwebkit_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtwebsockets_5.3.1.bb | 5 -----
recipes-qt/qt5/qtwebsockets_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtx11extras_5.3.1.bb | 5 -----
recipes-qt/qt5/qtx11extras_5.3.2.bb | 5 +++++
recipes-qt/qt5/qtxmlpatterns_5.3.1.bb | 5 -----
recipes-qt/qt5/qtxmlpatterns_5.3.2.bb | 5 +++++
49 files changed, 119 insertions(+), 119 deletions(-)
delete mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.3.1.bb
create mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.3.2.bb
delete mode 100644 recipes-qt/qt5/nativesdk-qttools_5.3.1.bb
create mode 100644 recipes-qt/qt5/nativesdk-qttools_5.3.2.bb
rename recipes-qt/qt5/{qt5-5.3.1.inc => qt5-5.3.2.inc} (100%)
rename recipes-qt/qt5/{qtbase-native_5.3.1.bb => qtbase-native_5.3.2.bb} (63%)
delete mode 100644 recipes-qt/qt5/qtbase_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtbase_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtconnectivity_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtconnectivity_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtdeclarative_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtdeclarative_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtenginio_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtenginio_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtimageformats_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtimageformats_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtlocation_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtlocation_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtmultimedia_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtmultimedia_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtquick1_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtquick1_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtquickcontrols_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtquickcontrols_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtscript_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtscript_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtsensors_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtsensors_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtserialport_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtserialport_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtsvg_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtsvg_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qttools-native_5.3.1.bb
create mode 100644 recipes-qt/qt5/qttools-native_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qttools_5.3.1.bb
create mode 100644 recipes-qt/qt5/qttools_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtwebkit-examples_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtwebkit-examples_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtwebkit_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtwebkit_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtwebsockets_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtwebsockets_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtx11extras_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtx11extras_5.3.2.bb
delete mode 100644 recipes-qt/qt5/qtxmlpatterns_5.3.1.bb
create mode 100644 recipes-qt/qt5/qtxmlpatterns_5.3.2.bbconf/distro/include/qt5-versions.inc +2 -2
@@ -1,7 +1,7 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.3.1", "5.3.0+git%" +# possible values now "5.3.2", "5.3.0+git%" -QT5_VERSION ?= "5.3.1" +QT5_VERSION ?= "5.3.2" PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" PREFERRED_VERSION_qtbase = "${QT5_VERSION}"
recipes-qt/qt5/nativesdk-qtbase_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "572c9953847d391f2d33b420bbcdca46" -SRC_URI[sha256sum] = "7b5a138d30d7c0228a51084407d5210f6d1acfbee2f95b87f189872cfcd3a569"
recipes-qt/qt5/nativesdk-qtbase_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "563e2b10274171f1184b3fd7260b4991" +SRC_URI[sha256sum] = "9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8"
recipes-qt/qt5/nativesdk-qttools_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "7264920fc489ac878d40218263df8c4e" -SRC_URI[sha256sum] = "edf59eeead3c1d202883c2e6091abd1d40ac37b6e6b0e240b29ab75f86c515a7"
recipes-qt/qt5/nativesdk-qttools_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "9074cc89bc52aea7f76a4d231d2f0ef6" +SRC_URI[sha256sum] = "5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e"
recipes-qt/qt5/qt5-5.3.2.inc renamed from recipes-qt/qt5/qt5-5.3.1.inc +0 -0
recipes-qt/qt5/qtbase-native_5.3.2.bb renamed from recipes-qt/qt5/qtbase-native_5.3.1.bb +2 -2
@@ -7,5 +7,5 @@ do_install_append() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRC_URI[md5sum] = "572c9953847d391f2d33b420bbcdca46" -SRC_URI[sha256sum] = "7b5a138d30d7c0228a51084407d5210f6d1acfbee2f95b87f189872cfcd3a569" +SRC_URI[md5sum] = "563e2b10274171f1184b3fd7260b4991" +SRC_URI[sha256sum] = "9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8"
recipes-qt/qt5/qtbase_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "572c9953847d391f2d33b420bbcdca46" -SRC_URI[sha256sum] = "7b5a138d30d7c0228a51084407d5210f6d1acfbee2f95b87f189872cfcd3a569"
recipes-qt/qt5/qtbase_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "563e2b10274171f1184b3fd7260b4991" +SRC_URI[sha256sum] = "9a16095ac46dae99d6ddab8bc07065fbe1c36501ed194a3191d07347d7826cb8"
recipes-qt/qt5/qtconnectivity_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "2693394de6dd97d3a054791cef77b928" -SRC_URI[sha256sum] = "dc5253a62e178a0882a74dc48114c7fd2a3e8feea91df0d9670f11d16361ee67"
recipes-qt/qt5/qtconnectivity_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "e496963407bb0c7b2e6c07133715a9cf" +SRC_URI[sha256sum] = "2eb972b85697e9752ed2f2f7e194393650743737a9fe5f48177734c4dbd9096f"
recipes-qt/qt5/qtdeclarative_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "765579f4f64cb64a812c8a80104eb8ec" -SRC_URI[sha256sum] = "9a80d401dfbb64f109abf210cb32775a102f7b2420b3a3175b8dab0792220380"
recipes-qt/qt5/qtdeclarative_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "72ae60527ebb15f4b85cfbadc4c174de" +SRC_URI[sha256sum] = "04108193b9642c0394c157e98b5c1d81f555f9f495289e07ebfb6f03448b2382"
recipes-qt/qt5/qtenginio_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "89bffcd329886fd1fe4e504c666987cd" -SRC_URI[sha256sum] = "6e1ba11fb84f9778497baff1ae06364d8ff13cd79a66d671a35832e7e856702d"
recipes-qt/qt5/qtenginio_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "53b67cf5470dfa9bcfc59aa5b8bfd66d" +SRC_URI[sha256sum] = "d5b84656dc6a349db380e42690a18137e562dbaba1930216bb3e3815df6af708"
recipes-qt/qt5/qtgraphicaleffects_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "bed5b36e721de1e356b879e5c811d799" -SRC_URI[sha256sum] = "53d8a4846f1fefb13aba4cebf3d3f808df69ec187cc435e895eb34152c4e860f"
recipes-qt/qt5/qtgraphicaleffects_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "6dd8dd6906bbfb52a292cd25927bb9a8" +SRC_URI[sha256sum] = "688f2658a13d2919487d3f5acacb037364ee5c8fe0319f524a7d0a4987ba7ffc"
recipes-qt/qt5/qtimageformats_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "8bf9b65e5a586091d0ce9f9107367f4a" -SRC_URI[sha256sum] = "62e790029ddf0c5eea7623958ef97144b3c94113cab1e9fa5fbf326625dba3bf"
recipes-qt/qt5/qtimageformats_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "255bb7f28c667ab91303e6af271753b5" +SRC_URI[sha256sum] = "d303cbceb73774edc0cfdbde6b97b0e41077e242ff6520710890f81bea40e2d4"
recipes-qt/qt5/qtlocation_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "697731ec5aaf482826495cd419cab4f0" -SRC_URI[sha256sum] = "1b3f262569c329cddfd9355994a47b7f62b70f15343e1d818c706bf4473dbbf5"
recipes-qt/qt5/qtlocation_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "1ad3ee98f6f5d71df8dda14edc06346c" +SRC_URI[sha256sum] = "37b4072b531c35389b3acbbbd7259ab6ce4106177b96d67bfe5d3236139814d7"
recipes-qt/qt5/qtmultimedia_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "b373739f085207dda92b3399d477faf8" -SRC_URI[sha256sum] = "c4108979f869645d91d7bcc2004b4bcfbae7332c1281ed5697a551a0d046e98c"
recipes-qt/qt5/qtmultimedia_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "5ef68e85b9d32865a4bf7f491ff31f96" +SRC_URI[sha256sum] = "255fac66c93f33743c707da3d41d95c7c562924fe4eb829cbb7b21b2274a0e0b"
recipes-qt/qt5/qtquick1_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "401ebe552dc76041e2485507ecbdfc80" -SRC_URI[sha256sum] = "44902d12a0a711e39f611db1cedff4e4144c21d9f0d6527181a132224381191f"
recipes-qt/qt5/qtquick1_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "3a57c52d6d4d6632d67a4ebd35abe0c5" +SRC_URI[sha256sum] = "9b7b2e895180e4e3e1ed4e7b5ad049b7d021a05c96be6edc5fc433c6de6273fb"
recipes-qt/qt5/qtquickcontrols_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "90bffd1ea73d2f13322b25aa1b2d5e25" -SRC_URI[sha256sum] = "f6936130d7d2f08062dd9b9b19dcde56511ff038e57ae813fbb0943477871c1d"
recipes-qt/qt5/qtquickcontrols_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "05f490fd6a7d3bca0c4d4a59989daef0" +SRC_URI[sha256sum] = "5f890f014d087141b0aaa8954b21b1f85740233b60a556e0e9624227bff6d94e"
recipes-qt/qt5/qtscript_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "262c142aac926b492a1bf7fa3f9a96c2" -SRC_URI[sha256sum] = "5bbfa86bf646fbc863f2a674c83b366b65301d3e1529ffe86860eb90fca13a85"
recipes-qt/qt5/qtscript_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "d0e70adf7c993f33bad27290dae778d5" +SRC_URI[sha256sum] = "6e18002c8c993402c7d28b3c0705092e41c18769b6d3ff741e9a3b3ce9d6d7be"
recipes-qt/qt5/qtsensors_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "ce3868ac3be057ba112f4c8f6da67e94" -SRC_URI[sha256sum] = "8f41113571ace59f88e91d74e113e24f8f934f6b571da3c976b53bd42e86c238"
recipes-qt/qt5/qtsensors_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "d0a8dc3173bfc9dc9f2632d509a76e6f" +SRC_URI[sha256sum] = "f9359dc42fbd7105eec7a1fb866e90aa772fd694075e5a5691d1a31d08953ae4"
recipes-qt/qt5/qtserialport_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "d9557391a3ab696089d657cb3a2b608e" -SRC_URI[sha256sum] = "83dc0b1152043d4e04e6135ea65accc749424b498ee018de9b390d712ccbc065"
recipes-qt/qt5/qtserialport_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "0a38cfe5c81364f2b93d0d38b94d375f" +SRC_URI[sha256sum] = "a886e0cb08be60e57958676dc91c6f649468184a03c89c2aeabc904d36fd5a4b"
recipes-qt/qt5/qtsvg_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "1a54f0495ad7239038f57d8a2715203c" -SRC_URI[sha256sum] = "c2daa131cd41f230d5903e1b754249ed16609df98a08e70b62b5610c4a3a1774"
recipes-qt/qt5/qtsvg_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "f7972e80970ff26a908c43defb3d10e6" +SRC_URI[sha256sum] = "1ec5c2f307ee55740cc8c82dc2ca4037dbc0ca398b4e32abbd967535e71ae30f"
recipes-qt/qt5/qttools-native_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "7264920fc489ac878d40218263df8c4e" -SRC_URI[sha256sum] = "edf59eeead3c1d202883c2e6091abd1d40ac37b6e6b0e240b29ab75f86c515a7"
recipes-qt/qt5/qttools-native_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "9074cc89bc52aea7f76a4d231d2f0ef6" +SRC_URI[sha256sum] = "5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e"
recipes-qt/qt5/qttools_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "7264920fc489ac878d40218263df8c4e" -SRC_URI[sha256sum] = "edf59eeead3c1d202883c2e6091abd1d40ac37b6e6b0e240b29ab75f86c515a7"
recipes-qt/qt5/qttools_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "9074cc89bc52aea7f76a4d231d2f0ef6" +SRC_URI[sha256sum] = "5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e"
recipes-qt/qt5/qtwebkit-examples_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "5827c61adba1d6921c51ef7ba1adce68" -SRC_URI[sha256sum] = "8d4b5845b0fd99511ea7e7901d46ba8d50dc1f19cbce4496f279677e7ac45aca"
recipes-qt/qt5/qtwebkit-examples_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "6f88c2a99002801a1943483331f8b4f0" +SRC_URI[sha256sum] = "c8081a0863b7d8e2e39ec0e2fe288331ddab093a682959ba7378392512296482"
recipes-qt/qt5/qtwebkit_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "0f2bb8af6be2306b2b4d194a7ebf6fcc" -SRC_URI[sha256sum] = "69a47c5645918fc27bff630275685f300e42b4dfd99ccd3e5aa1c8a6d0725156"
recipes-qt/qt5/qtwebkit_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "0497b5b46540848e0db6a9e219d756fb" +SRC_URI[sha256sum] = "e47122ed15e8e1cc32e11b3cd89bacc056437215134a204899f2fddb4fd92e5b"
recipes-qt/qt5/qtwebsockets_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "275078e21f8d84c29e0cce6fd58ae28c" -SRC_URI[sha256sum] = "5b68ce55bab94d0d9dfa86ef7a2c3f402e931cc12fd028766f531148b9e31ddc"
recipes-qt/qt5/qtwebsockets_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "093ddc113952e47bd0e251986e03f1e4" +SRC_URI[sha256sum] = "60533d413b0fa27b1e08642ae77bcaa76a845fa39ddc3d49af573a77e73a38c2"
recipes-qt/qt5/qtx11extras_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "184cdea8945a6d62131fae75c673225d" -SRC_URI[sha256sum] = "25fa2801367c050ac19ad3b6f92d38890314c9cbf2d833b1571e1a7ea22b4f71"
recipes-qt/qt5/qtx11extras_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "59f6cbbdf2ad48c6b95b65f8b333df2d" +SRC_URI[sha256sum] = "ca6a28c95be0bf18080b4a20ae9e2c24a77a45aaf557f06047e65b1280c17251"
recipes-qt/qt5/qtxmlpatterns_5.3.1.bb deleted +0 -5
@@ -1,5 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI[md5sum] = "d263163cc6e9ba7a4e8bd6c558f3ae42" -SRC_URI[sha256sum] = "c597ed383d1d433960ffeb4a3784979235a399e62b27b60b5d67aa2c9aa8653f"
recipes-qt/qt5/qtxmlpatterns_5.3.2.bb new file +5 -0
@@ -0,0 +1,5 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI[md5sum] = "857e8040b2bf45c114a7d75ec6ef94ee" +SRC_URI[sha256sum] = "acab0307039e117475caf2c95e425ead09ab5ee08ce15205fb3c0af7d7ec1abb"
Signature · 1 line
2.1.1
PATCH 2/4 qtwebengine: update repository location
* both were moved from qt-labs to qt and chromium repo was renamed to qtwebengine-chromium
Signed-off-by Martin Jansa <[email protected]>
--- recipes-qt/qt5/qtwebengine_git.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
recipes-qt/qt5/qtwebengine_git.bb +4 -3
@@ -6,14 +6,15 @@ require ${PN}.inc # the master branch which will lead to 1.0 when Qt 5.4 is released here. PV = "0.9.99+git${SRCPV}" -QT_MODULE_BRANCH = "master" +QT_MODULE_BRANCH = "1.0" +QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based" # For now we have to define SRC_URI here again as qt5-git.inc points to # qt.gitorious.org/qt/ but qtwebengine is still on qt.gitorious.org/qt-labs/ which will # switch soon. SRC_URI = " \ - git://gitorious.org/qt-labs/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \ - git://gitorious.org/qt-labs/chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH};destsuffix=git/src/3rdparty \ + git://gitorious.org/qt/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \ + git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ file://0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch \ file://0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ file://0003-functions.prf-Try-to-add-_moc-suffix.patch \
Signature · 1 line
2.1.1
PATCH 3/4 qt*: refresh the patches
In reply to Martin JansaSigned-off-by Martin Jansa <[email protected]>
---
recipes-qt/qt5/nativesdk-qtbase.inc | 4 +--
recipes-qt/qt5/qtbase-native.inc | 2 +-
recipes-qt/qt5/qtbase.inc | 2 +-
.../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 8 +++---
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 6 ++--
.../0003-Add-external-hostbindir-option.patch | 32 +++++++++++-----------
...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 10 +++----
...le-Fix-pkgconfig-and-libtool-replacements.patch | 8 +++---
...lfs-Print-the-chosen-config-in-debug-mode.patch | 6 ++--
...mintegration-Undefine-CursorShape-from-X..patch | 6 ++--
...ump-path-length-from-256-to-512-character.patch | 8 +++---
...gl-error-for-platforms-only-supporting-on.patch | 6 ++--
...10-Revert-Use-the-gcc-feature-in-simd.prf.patch | 6 ++--
.../0011-QOpenGLPaintDevice-sub-area-support.patch | 6 ++--
...build-uic.patch => 0012-Always-build-uic.patch} | 6 ++--
...build-it-in-configure-but-allow-to-build.patch} | 8 +++---
...eserve-built-qmake-and-swap-with-native-.patch} | 8 +++---
.../0001-qmltestexample-fix-link.patch | 4 +--
...ats.pro-Make-the-dependencies-determinist.patch | 4 +--
...w-to-build-only-lrelease-lupdate-lconvert.patch | 4 +--
...t-help-fix-linking-of-dependent-libraries.patch | 4 +--
.../0003-add-noqtwebkit-configuration.patch | 4 +--
...-qtwaylandscanner-tool-to-the-native-side.patch | 6 ++--
...o-include-server-buffer-only-when-buildin.patch | 8 +++---
24 files changed, 83 insertions(+), 83 deletions(-)
rename recipes-qt/qt5/qtbase/{0011-Always-build-uic.patch => 0012-Always-build-uic.patch} (87%)
rename recipes-qt/qt5/qtbase/{0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch => 0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch} (88%)
rename recipes-qt/qt5/qtbase/{0012-configure-preserve-built-qmake-and-swap-with-native-.patch => 0013-configure-preserve-built-qmake-and-swap-with-native-.patch} (81%)recipes-qt/qt5/nativesdk-qtbase.inc +2 -2
@@ -27,12 +27,12 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ - file://0011-Always-build-uic.patch \ + file://0012-Always-build-uic.patch \ " # specific for nativesdk-qtbase SRC_URI += " \ - file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \ + file://0013-configure-preserve-built-qmake-and-swap-with-native-.patch \ " PACKAGES = "${PN}-tools-dbg ${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools"
recipes-qt/qt5/qtbase-native.inc +1 -1
@@ -24,7 +24,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ - file://0011-Always-build-uic.patch \ + file://0012-Always-build-uic.patch \ " QT_CONF_PATH = "${B}/qt.conf"
recipes-qt/qt5/qtbase.inc +1 -1
@@ -17,7 +17,7 @@ SRC_URI += "\ # specific for qtbase SRC_URI += "\ - file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ + file://0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ " DEPENDS += "qtbase-native"
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +4 -4
@@ -1,7 +1,7 @@ -From c5b50848ead7de12ec18cd30940d74d92b974280 Mon Sep 17 00:00:00 2001 +From 9816098355731afb60cd41d334be97d07f0dcc42 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/12] Add linux-oe-g++ platform +Subject: [PATCH 01/13] 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
@@ -51,7 +51,7 @@ Signed-off-by: Martin Jansa <[email protected]> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index d5c2b08..4eae0d3 100755 +index cb8d78f..3f7b41b 100755 --- a/configure +++ b/configure @@ -324,6 +324,16 @@ getQMakeConf()
@@ -346,5 +346,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +3 -3
@@ -1,7 +1,7 @@ -From 5d83d8ce8b601a983b055f32dc67a418a0ce06ab Mon Sep 17 00:00:00 2001 +From 2749053c1a0670fea50f2f716fea0839fbbbb007 Mon Sep 17 00:00:00 2001 From: Holger Freyther <[email protected]> Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/13] 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
@@ -35,5 +35,5 @@ index 174c1d0..69e614f 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +16 -16
@@ -1,7 +1,7 @@ -From b544f5f3462e2981ada045a32038b7f116f8590c Mon Sep 17 00:00:00 2001 +From e263260c50051327e3f7f2ca8c46e014228e0078 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/12] Add -external-hostbindir option +Subject: [PATCH 03/13] 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
@@ -38,10 +38,10 @@ Signed-off-by: Jonathan Liu <[email protected]> 11 files changed, 51 insertions(+), 13 deletions(-) diff --git a/configure b/configure -index d5c2b08..dcd066c 100755 +index 3f7b41b..18d1a0b 100755 --- a/configure +++ b/configure -@@ -759,6 +759,7 @@ QT_HOST_BINS= +@@ -777,6 +777,7 @@ QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= QT_EXT_PREFIX=
@@ -49,7 +49,7 @@ index d5c2b08..dcd066c 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -878,6 +879,7 @@ while [ "$#" -gt 0 ]; do +@@ -896,6 +897,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \
@@ -57,7 +57,7 @@ index d5c2b08..dcd066c 100755 -hostlibdir| \ -extprefix| \ -sysroot| \ -@@ -1092,6 +1094,9 @@ while [ "$#" -gt 0 ]; do +@@ -1110,6 +1112,9 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;;
@@ -67,7 +67,7 @@ index d5c2b08..dcd066c 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -2230,6 +2235,10 @@ Installation options: +@@ -2248,6 +2253,10 @@ Installation options: -hostdatadir <dir> . Data used by qmake will be installed to <dir> (default HOSTPREFIX)
@@ -78,7 +78,7 @@ index d5c2b08..dcd066c 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -2897,6 +2906,11 @@ fi +@@ -2915,6 +2924,11 @@ fi # command line and environment validation #-------------------------------------------------------------------------------
@@ -90,7 +90,7 @@ index d5c2b08..dcd066c 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 -@@ -3577,6 +3591,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { +@@ -3595,6 +3609,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",
@@ -211,10 +211,10 @@ index 9bda70e..6e3605a 100644 _qt5_Core_check_file_exists(${imported_location}) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 174c1d0..1fe03cb 100644 +index 69e614f..a95ca35 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -333,7 +333,7 @@ QLibraryInfo::isDebugBuild() +@@ -336,7 +336,7 @@ QLibraryInfo::isDebugBuild() */ static const struct {
@@ -223,7 +223,7 @@ index 174c1d0..1fe03cb 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -359,6 +359,7 @@ static const struct { +@@ -362,6 +362,7 @@ static const struct { { "HostBinaries", "bin" }, { "HostLibraries", "lib" }, { "HostData", "." },
@@ -279,10 +279,10 @@ index 99d87e2..5621dc0 100644 _qt5_Widgets_check_file_exists(${imported_location}) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index b756509..7e61845 100644 +index 90981f6..7d73882 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -1213,6 +1213,13 @@ void Configure::parseCmdLine() +@@ -1215,6 +1215,13 @@ void Configure::parseCmdLine() dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); }
@@ -296,7 +296,7 @@ index b756509..7e61845 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -3983,6 +3990,7 @@ void Configure::generateQConfigCpp() +@@ -4006,6 +4013,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
@@ -305,5 +305,5 @@ index b756509..7e61845 100644 << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -2.0.1 +2.1.1
recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +5 -5
@@ -1,7 +1,7 @@ -From 4a86d338f04c2bfa4d3f63a2fa9d1252503757fd Mon Sep 17 00:00:00 2001 +From 34a32208034a03c0d591dc79386f97ae020652e7 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 04/12] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 04/13] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT Upstream-Status: Pending
@@ -11,10 +11,10 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 7e61845..29c6358 100644 +index 7d73882..c572fbb 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri() +@@ -3393,8 +3393,8 @@ void Configure::generateQConfigPri() configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { // FIXME: add detection
@@ -26,5 +26,5 @@ index 7e61845..29c6358 100644 configStream << "}" << endl; configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +4 -4
@@ -1,7 +1,7 @@ -From 71e5a4c62ca38b30a14c9957db21a7cbf5fcf54d Mon Sep 17 00:00:00 2001 +From 9e7667c9124ab287dc0f7ad40c2b61c435ffc186 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 05/12] qt_module: Fix pkgconfig and libtool replacements +Subject: [PATCH 05/13] qt_module: Fix pkgconfig and libtool replacements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
@@ -80,7 +80,7 @@ index 4dcabe9..d04bc3e 100644 lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 8bf4c92..ee2e989 100644 +index 8bf4c92..2e229fc 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -188,10 +188,25 @@ unix|mingw {
@@ -110,5 +110,5 @@ index 8bf4c92..ee2e989 100644 } -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +3 -3
@@ -1,7 +1,7 @@ -From a3e87ebdf7dff6b9d4b1d8191f044cfb56b9da3d Mon Sep 17 00:00:00 2001 +From ce38ab8b2167b74fa90eb3e17507dc9e799a3274 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 21 Apr 2014 19:22:04 +0200 -Subject: [PATCH 06/12] Revert "eglfs: Print the chosen config in debug mode" +Subject: [PATCH 06/13] Revert "eglfs: Print the chosen config in debug mode" This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. ---
@@ -52,5 +52,5 @@ index eec6463..4a7c69b 100644 // Make the context current to ensure the GL version query works. This needs a surface too. const EGLint pbufferAttributes[] = { -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch +3 -3
@@ -1,7 +1,7 @@ -From 75fbeec66d98aacad5be1e3fcfd92f42b1ef0da7 Mon Sep 17 00:00:00 2001 +From 7c16b57ecdddffb4bb52d32bb763791fd8aa8414 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 19 Mar 2014 18:32:28 +0100 -Subject: [PATCH 07/12] qeglplatformintegration: Undefine CursorShape from X.h +Subject: [PATCH 07/13] qeglplatformintegration: Undefine CursorShape from X.h Signed-off-by: Martin Jansa <[email protected]> ---
@@ -26,5 +26,5 @@ index f665455..9eb783c 100644 class QEGLPlatformScreen; -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase/0008-configure-bump-path-length-from-256-to-512-character.patch +4 -4
@@ -1,7 +1,7 @@ -From a3beca1f4ba231baf38e7de0221e55681437966d Mon Sep 17 00:00:00 2001 +From 68e499a4a521f3876aca195ba8ed5b63d45d09ed Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Mon, 11 Nov 2013 20:27:30 -0500 -Subject: [PATCH 08/12] configure: bump path length from 256 to 512 characters +Subject: [PATCH 08/13] configure: bump path length from 256 to 512 characters Increase the path length that gets hardcoded into generated config.cpp file from 256 to 512 characters, as nativesdk path can be quite long.
@@ -12,7 +12,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 48d5119..3c0347a 100755 +index 18d1a0b..ca0824f 100755 --- a/configure +++ b/configure @@ -3573,7 +3573,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
@@ -25,5 +25,5 @@ index 48d5119..3c0347a 100755 "qt_prfxpath=$QT_SYSROOT_PREFIX", "qt_docspath=$QT_SYSROOT_DOCS", -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +3 -3
@@ -1,7 +1,7 @@ -From 6d1123116233e55c4ade13378eec41fb7441cec6 Mon Sep 17 00:00:00 2001 +From 3408e6d6c56a18bed48353c2f1b2e18f6716fc4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Wed, 5 Feb 2014 18:35:08 +0100 -Subject: [PATCH 09/12] eglfs: fix egl error for platforms only supporting one +Subject: [PATCH 09/13] eglfs: fix egl error for platforms only supporting one window/surface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8
@@ -68,5 +68,5 @@ index 2d36c0b..854531e 100644 if (isRaster()) { -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch +3 -3
@@ -1,7 +1,7 @@ -From 2a6891f2cbf221b51b214a527adb4602e20b100b Mon Sep 17 00:00:00 2001 +From 4a6476822784ca6a10f59cfb3e941854ccea8408 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 4 Jun 2014 15:26:11 +0200 -Subject: [PATCH 10/12] Revert "Use the "gcc" feature in simd.prf" +Subject: [PATCH 10/13] Revert "Use the "gcc" feature in simd.prf" This reverts commit 3b00cc480400d47c59c29d3507c7fcdc9be2a489. ---
@@ -22,5 +22,5 @@ index 62a63f9..4f86f60 100644 HEADERS += $$SSE2_HEADERS -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase/0011-QOpenGLPaintDevice-sub-area-support.patch +3 -3
@@ -1,7 +1,7 @@ -From 606dc31c85d97dff52b07ec9c896718c6533f670 Mon Sep 17 00:00:00 2001 +From 3902dcd1d7da169229deffbff02ac1a159b08d44 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <[email protected]> Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH 11/11] QOpenGLPaintDevice sub-area support +Subject: [PATCH 11/13] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer.
@@ -148,5 +148,5 @@ index 0610ab6..ea1e3b2 100644 } else { if (m_vao.isCreated()) { -- -2.0.2 +2.1.1
recipes-qt/qt5/qtbase/0012-Always-build-uic.patch renamed from recipes-qt/qt5/qtbase/0011-Always-build-uic.patch +3 -3
@@ -1,7 +1,7 @@ -From bf4593d727fa673734bb1930f79fc012e52250ec Mon Sep 17 00:00:00 2001 +From bdcbca2fcb09d48af75e99b7dfa6ce211507925c Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH 11/12] Always build uic +Subject: [PATCH 12/13] Always build uic Even if we are not building gui or widgets. This tool is needed later as a native tool when compiling the target.
@@ -27,5 +27,5 @@ index 6a805a6..90623a6 100644 nacl: SUBDIRS -= src_network src_testlib -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase/0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch renamed from recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +4 -4
@@ -1,7 +1,7 @@ -From 6317e81c96cec598da266d0c863afa4320d1e38a Mon Sep 17 00:00:00 2001 +From bb0958af49c1ad4d35b6b6b9033cd46eda4a3ac8 Mon Sep 17 00:00:00 2001 From: Michael Krelin <[email protected]> Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build +Subject: [PATCH 12/12] qmake: don't build it in configure, but allow to build it separately * it is already built in qtbase-native, so we don't need it in configure
@@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <[email protected]> 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index 3c0347a..a75ca11 100755 +index ca0824f..5a09ae3 100755 --- a/configure +++ b/configure @@ -3675,7 +3675,7 @@ setBootstrapEvalVariable()
@@ -46,5 +46,5 @@ index 89d6ea5..7c605b9 100644 VPATH += \ ../src/corelib/global \ -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch renamed from recipes-qt/qt5/qtbase/0012-configure-preserve-built-qmake-and-swap-with-native-.patch +4 -4
@@ -1,7 +1,7 @@ -From bfc795c5af38731dbd18d20467e27dd710df374c Mon Sep 17 00:00:00 2001 +From 68bd66b37455f9b27b2f030948943942e12b3af1 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Mon, 11 Nov 2013 20:22:34 -0500 -Subject: [PATCH 12/12] configure: preserve built qmake and swap with native +Subject: [PATCH 13/13] configure: preserve built qmake and swap with native one Let configure script build the real qmake, but right after it's built, swap
@@ -13,7 +13,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]> 1 file changed, 2 insertions(+) diff --git a/configure b/configure -index 3c0347a..c51f785 100755 +index ca0824f..2c097c3 100755 --- a/configure +++ b/configure @@ -3825,6 +3825,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
@@ -26,5 +26,5 @@ index 3c0347a..c51f785 100755 echo "Running configuration tests..." -- -2.0.0 +2.1.1
recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +2 -2
@@ -1,4 +1,4 @@ -From c38b854abffbae52c118a361e49987a7623e231a Mon Sep 17 00:00:00 2001 +From fd077fa40e7750f5836a07dde4f9c65864f87c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]> Date: Sun, 26 May 2013 14:26:19 +0200 Subject: [PATCH] qmltestexample: fix link
@@ -84,5 +84,5 @@ index 1bb913e..56f2dd5 100644 load(qt_tool) -- -2.0.0 +2.1.1
recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch +2 -2
@@ -1,4 +1,4 @@ -From f309b1e149764a193cbfc694973083e70b5f4a7e Mon Sep 17 00:00:00 2001 +From 862ce82f7c0237b839539332c860e12c7d3c3e67 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 4 Aug 2014 19:19:05 +0200 Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic
@@ -27,5 +27,5 @@ index 8382e5c..63d13ce 100644 load(qt_parts) -- -2.0.4 +2.1.1
recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +2 -2
@@ -1,4 +1,4 @@ -From f4eb217f9b706a13e7f8256b8540970cfc78d805 Mon Sep 17 00:00:00 2001 +From 7bd3f1feea0ec1121a73faa1214e72702954b317 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 11 Sep 2013 18:30:08 +0200 Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert
@@ -150,5 +150,5 @@ index c3acfe3..f2f88f7 100644 installed_cmake.depends = cmake -- -2.0.0 +2.1.1
recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +2 -2
@@ -1,4 +1,4 @@ -From 2b9829a4aa1379a69343371991a81b3769ac7dec Mon Sep 17 00:00:00 2001 +From a74f00b2a64dde326a78f7523f875d7e14ee45f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Fri, 17 Jan 2014 14:33:19 +0100 Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 + +LIBS += -lQt5CLucene -- -2.0.0 +2.1.1
recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +2 -2
@@ -1,4 +1,4 @@ -From 6bb257d69ba7ac93b2b11aae35e0a523785d94ad Mon Sep 17 00:00:00 2001 +From 7388296f5219725801aeb9d8b0a2f4ba01a7ca6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH 3/3] add noqtwebkit configuration
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget -- -2.0.4 +2.1.1
recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +3 -3
@@ -1,4 +1,4 @@ -From 761367755efa529c41ba414521eaed0b10873d99 Mon Sep 17 00:00:00 2001 +From fd79724a05ee7fb52d8ac1b02057e7a1ba4efb14 Mon Sep 17 00:00:00 2001 From: Simon Busch <[email protected]> Date: Fri, 19 Jul 2013 13:35:14 +0000 Subject: [PATCH] Install the qtwaylandscanner tool to the native side
@@ -11,7 +11,7 @@ Signed-off-by: Simon Busch <[email protected]> 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro -index ac2d07b..53b93f9 100644 +index ac2d07b..7a46a24 100644 --- a/src/qtwaylandscanner/qtwaylandscanner.pro +++ b/src/qtwaylandscanner/qtwaylandscanner.pro @@ -1,6 +1,10 @@
@@ -28,5 +28,5 @@ index ac2d07b..53b93f9 100644 +target.path = $$[QT_HOST_BINS] +INSTALLS += target -- -1.8.1.2 +2.1.1
recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch +4 -4
@@ -1,4 +1,4 @@ -From 201b36614907584a0d446975bddbb11a495540ed Mon Sep 17 00:00:00 2001 +From 6e554b116bfe57744a3de02370fd96b9ea13ecb2 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 22 Feb 2014 17:47:44 +0100 Subject: [PATCH] examples.pro: include server-buffer only when building with
@@ -14,10 +14,10 @@ Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/examples.pro b/examples/examples.pro -index 2d4cd1b..fb2497e 100644 +index d633fb9..643c7cd 100644 --- a/examples/examples.pro +++ b/examples/examples.pro -@@ -13,5 +13,7 @@ contains(CONFIG, wayland-compositor) { +@@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { SUBDIRS += qml-compositor }
@@ -27,5 +27,5 @@ index 2d4cd1b..fb2497e 100644 + } } -- -1.8.5.3 +2.1.1
Signature · 1 line
2.1.1
PATCH 4/4 qt5: upgrade git recipes to 5.4-alpha1
In reply to Martin JansaSigned-off-by Martin Jansa <[email protected]>
---
conf/distro/include/qt5-versions.inc | 2 +-
recipes-qt/qt5/nativesdk-qtbase_git.bb | 16 ++--
recipes-qt/qt5/qt5-git.inc | 4 +-
.../qtbase-git/0001-Add-linux-oe-g-platform.patch | 36 ++++-----
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 10 +--
.../0003-Add-external-hostbindir-option.patch | 44 +++++------
...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 10 +--
...le-Fix-pkgconfig-and-libtool-replacements.patch | 10 +--
...lfs-Print-the-chosen-config-in-debug-mode.patch | 56 --------------
...integration-Undefine-CursorShape-from-X..patch} | 12 +--
...mp-path-length-from-256-to-512-character.patch} | 10 +--
...l-error-for-platforms-only-supporting-on.patch} | 16 ++--
...0009-QOpenGLPaintDevice-sub-area-support.patch} | 36 ++++-----
...build-uic.patch => 0010-Always-build-uic.patch} | 10 +--
...10-Revert-Use-the-gcc-feature-in-simd.prf.patch | 26 -------
...build-it-in-configure-but-allow-to-build.patch} | 10 +--
...eserve-built-qmake-and-swap-with-native-.patch} | 10 +--
recipes-qt/qt5/qtbase-native_git.bb | 14 ++--
recipes-qt/qt5/qtbase_git.bb | 14 ++--
recipes-qt/qt5/qtconnectivity_git.bb | 2 +-
.../0001-qmltestexample-fix-link.patch | 88 ++++++++++++++++++++++
recipes-qt/qt5/qtdeclarative_git.bb | 2 +-
recipes-qt/qt5/qtenginio_git.bb | 3 +-
recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +-
recipes-qt/qt5/qtimageformats_git.bb | 2 +-
recipes-qt/qt5/qtlocation_git.bb | 2 +-
recipes-qt/qt5/qtquick1_git.bb | 2 +-
recipes-qt/qt5/qtquickcontrols_git.bb | 2 +-
recipes-qt/qt5/qtscript_git.bb | 2 +-
recipes-qt/qt5/qtsensors_git.bb | 2 +-
recipes-qt/qt5/qtserialport_git.bb | 2 +-
recipes-qt/qt5/qtsvg_git.bb | 2 +-
recipes-qt/qt5/qtsystems_git.bb | 2 +
...w-to-build-only-lrelease-lupdate-lconvert.patch | 29 +++----
...t-help-fix-linking-of-dependent-libraries.patch | 6 +-
.../0003-add-noqtwebkit-configuration.patch | 4 +-
recipes-qt/qt5/qttools-native_git.bb | 2 +-
recipes-qt/qt5/qttools_git.bb | 2 +-
recipes-qt/qt5/qtwayland-native_git.bb | 6 +-
recipes-qt/qt5/qtwayland_git.bb | 6 +-
recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +-
recipes-qt/qt5/qtwebkit_git.bb | 2 +-
recipes-qt/qt5/qtwebsockets_git.bb | 2 +-
recipes-qt/qt5/qtx11extras_git.bb | 2 +-
recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +-
45 files changed, 258 insertions(+), 268 deletions(-)
delete mode 100644 recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
rename recipes-qt/qt5/qtbase-git/{0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch => 0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch} (79%)
rename recipes-qt/qt5/qtbase-git/{0008-configure-bump-path-length-from-256-to-512-character.patch => 0007-configure-bump-path-length-from-256-to-512-character.patch} (78%)
rename recipes-qt/qt5/qtbase-git/{0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch => 0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch} (85%)
rename recipes-qt/qt5/qtbase-git/{0011-QOpenGLPaintDevice-sub-area-support.patch => 0009-QOpenGLPaintDevice-sub-area-support.patch} (84%)
rename recipes-qt/qt5/qtbase-git/{0011-Always-build-uic.patch => 0010-Always-build-uic.patch} (77%)
delete mode 100644 recipes-qt/qt5/qtbase-git/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch
rename recipes-qt/qt5/qtbase-git/{0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch => 0010-qmake-don-t-build-it-in-configure-but-allow-to-build.patch} (84%)
rename recipes-qt/qt5/qtbase-git/{0012-configure-preserve-built-qmake-and-swap-with-native-.patch => 0011-configure-preserve-built-qmake-and-swap-with-native-.patch} (74%)
create mode 100644 recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patchconf/distro/include/qt5-versions.inc +1 -1
@@ -1,5 +1,5 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.3.2", "5.3.0+git%" +# possible values now "5.3.2", "5.3.0+5.4.0-alpha1+git" QT5_VERSION ?= "5.3.2"
recipes-qt/qt5/nativesdk-qtbase_git.bb +7 -9
@@ -15,22 +15,20 @@ SRC_URI += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ - file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ - file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ - file://0008-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \ - file://0011-QOpenGLPaintDevice-sub-area-support.patch \ + file://0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ + file://0007-configure-bump-path-length-from-256-to-512-character.patch \ + file://0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ + file://0009-QOpenGLPaintDevice-sub-area-support.patch \ " # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ - file://0011-Always-build-uic.patch \ + file://0010-Always-build-uic.patch \ " # specific for nativesdk-qtbase SRC_URI += " \ - file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \ + file://0011-configure-preserve-built-qmake-and-swap-with-native-.patch \ " -SRCREV = "7a4dcbaabf037a6913a5662ebb74cc47e04673b9" +SRCREV = "8456adf0eeb9df8dd5f0547d4ad5a81888295f03"
recipes-qt/qt5/qt5-git.inc +2 -2
@@ -1,7 +1,7 @@ # Copyright (C) 2012 O.S. Systems Software LTDA. # Copyright (C) 2013-2014 Martin Jansa <[email protected]> -QT_MODULE_BRANCH ?= "stable" +QT_MODULE_BRANCH ?= "5.4" # each module needs to define valid SRCREV SRC_URI += " \
@@ -10,7 +10,7 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "5.3.0+git${SRCPV}" +PV = "5.3.0+5.4.0-alpha1+git${SRCPV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +15 -21
@@ -1,7 +1,7 @@ -From 9c7d71880c6ec5b07e3030b7c7a23e004d5c60a2 Mon Sep 17 00:00:00 2001 +From 679fe396c16e7ec5b862a3ddbf4b9a56287c06ff Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/12] Add linux-oe-g++ platform +Subject: [PATCH 01/11] 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
@@ -43,18 +43,18 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Martin Jansa <[email protected]> --- configure | 66 ++++++++++++++++------- - mkspecs/features/configure.prf | 4 +- + mkspecs/features/configure.prf | 2 +- mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ - 4 files changed, 188 insertions(+), 22 deletions(-) + 4 files changed, 187 insertions(+), 21 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index d5c2b08..4eae0d3 100755 +index 1efb645..b1dfca9 100755 --- a/configure +++ b/configure -@@ -324,6 +324,16 @@ getQMakeConf() +@@ -316,6 +316,16 @@ getQMakeConf() getSingleQMakeVariable "$1" "$specvals" }
@@ -71,7 +71,7 @@ index d5c2b08..4eae0d3 100755 getXQMakeConf() { if [ -z "$xspecvals" ]; then -@@ -333,6 +343,16 @@ getXQMakeConf() +@@ -325,6 +335,16 @@ getXQMakeConf() getSingleQMakeVariable "$1" "$xspecvals" }
@@ -88,7 +88,7 @@ index d5c2b08..4eae0d3 100755 compilerSupportsFlag() { cat >conftest.cpp <<EOF -@@ -548,21 +568,19 @@ fi +@@ -541,21 +561,19 @@ fi # initalize variables #-------------------------------------------------------------------------------
@@ -118,7 +118,7 @@ index d5c2b08..4eae0d3 100755 # Use CC/CXX to run config.tests mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -@@ -3140,7 +3158,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then +@@ -3141,7 +3159,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no fi
@@ -127,7 +127,7 @@ index d5c2b08..4eae0d3 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3175,7 +3193,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -3176,7 +3194,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then exit 1 fi fi
@@ -136,7 +136,7 @@ index d5c2b08..4eae0d3 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3633,6 +3651,14 @@ setBootstrapVariable() +@@ -3647,6 +3665,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" }
@@ -151,7 +151,7 @@ index d5c2b08..4eae0d3 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3671,14 +3697,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3685,14 +3711,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -175,10 +175,10 @@ index d5c2b08..4eae0d3 100755 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then setBootstrapVariable QMAKE_CFLAGS_RELEASE diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index fe41c54..e2db923 100644 +index 05e10c9..62f4a88 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf -@@ -60,12 +60,12 @@ defineTest(qtCompileTest) { +@@ -60,7 +60,7 @@ defineTest(qtCompileTest) { } # Clean up after previous run
@@ -187,12 +187,6 @@ index fe41c54..e2db923 100644 mkpath($$test_out_dir)|error("Aborting.") - qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { -- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { -+ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { - log("yes$$escape_expand(\\n)") - msg = "test $$1 succeeded" - write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 index 0000000..ca26b10
@@ -346,5 +340,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +5 -5
@@ -1,7 +1,7 @@ -From ad884ab378939e685a3b00af03bb6875d9bdc1d5 Mon Sep 17 00:00:00 2001 +From 50401a1b5bae733a56d457c2d884751c3e6a60fc Mon Sep 17 00:00:00 2001 From: Holger Freyther <[email protected]> Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/11] 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
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 6d25325..80e0f30 100644 +index c3ec2bc..1be2659 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings() +@@ -147,7 +147,10 @@ QLibrarySettings::QLibrarySettings() QSettings *QLibraryInfoPrivate::findConfiguration() {
@@ -35,5 +35,5 @@ index 6d25325..80e0f30 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +22 -22
143 lines not on this page · raw message
recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +5 -5
@@ -1,7 +1,7 @@ -From 8a14a69d5b0078554ed002e682c72e995b1e6320 Mon Sep 17 00:00:00 2001 +From df112e16f1bbd0c90a1ac17a6c3281a1be08fd93 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 04/12] configureapp: Prefix default LIBDIRS and INCDIRS with +Subject: [PATCH 04/11] configureapp: Prefix default LIBDIRS and INCDIRS with SYSROOT Upstream-Status: Pending
@@ -11,10 +11,10 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 7e61845..29c6358 100644 +index 7969132..439dcfb 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri() +@@ -3373,8 +3373,8 @@ void Configure::generateQConfigPri() configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { // FIXME: add detection
@@ -26,5 +26,5 @@ index 7e61845..29c6358 100644 configStream << "}" << endl; configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +5 -5
@@ -1,7 +1,7 @@ -From 1e87c127c5d268870c51894c955bf24cde83ff69 Mon Sep 17 00:00:00 2001 +From 191da67d9291ab25e0838831c3ea545074c7212d Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 05/12] qt_module: Fix pkgconfig and libtool replacements +Subject: [PATCH 05/11] qt_module: Fix pkgconfig and libtool replacements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
@@ -67,7 +67,7 @@ Signed-off-by: Andreas Müller <[email protected]> 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 4dcabe9..d04bc3e 100644 +index ebc5f00..46319d8 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) {
@@ -80,7 +80,7 @@ index 4dcabe9..d04bc3e 100644 lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 8bf4c92..ee2e989 100644 +index 6ab8267..2b4943c 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -188,10 +188,25 @@ unix|mingw {
@@ -110,5 +110,5 @@ index 8bf4c92..ee2e989 100644 } -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch deleted +0 -56
56 lines not on this page · raw message
recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch renamed from recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch +6 -6
@@ -1,7 +1,7 @@ -From 3d61189d1706d3367eada4e7db6f2c6c167130ce Mon Sep 17 00:00:00 2001 +From a1c780527273d348d9b59e084ceeec39fe8544ad Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 19 Mar 2014 18:32:28 +0100 -Subject: [PATCH 07/12] qeglplatformintegration: Undefine CursorShape from X.h +Subject: [PATCH 06/11] qeglplatformintegration: Undefine CursorShape from X.h Signed-off-by: Martin Jansa <[email protected]> ---
@@ -9,11 +9,11 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 6 insertions(+) diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -index f665455..9eb783c 100644 +index 4d7adce..c9b6873 100644 --- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h +++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -@@ -46,6 +46,12 @@ - #include <qpa/qplatformnativeinterface.h> +@@ -50,6 +50,12 @@ + #include <QtCore/QVariant> #include <EGL/egl.h> +// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/
@@ -26,5 +26,5 @@ index f665455..9eb783c 100644 class QEGLPlatformScreen; -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch renamed from recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch +5 -5
@@ -1,7 +1,7 @@ -From 107fe67947ced65315550e6a7795be24efaab371 Mon Sep 17 00:00:00 2001 +From dc8e9f9bab476ee75db1146b7f682c3e30cea943 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Mon, 11 Nov 2013 20:27:30 -0500 -Subject: [PATCH 08/12] configure: bump path length from 256 to 512 characters +Subject: [PATCH 07/11] configure: bump path length from 256 to 512 characters Increase the path length that gets hardcoded into generated config.cpp file from 256 to 512 characters, as nativesdk path can be quite long.
@@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 48d5119..3c0347a 100755 +index dcd1790..fe6bed4 100755 --- a/configure +++ b/configure -@@ -3573,7 +3573,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -3587,7 +3587,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 48d5119..3c0347a 100755 "qt_prfxpath=$QT_SYSROOT_PREFIX", "qt_docspath=$QT_SYSROOT_DOCS", -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch renamed from recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +8 -8
@@ -1,7 +1,7 @@ -From b8f2fdcd7683058554b5d76b270c5f4bb3d0b91a Mon Sep 17 00:00:00 2001 +From b5d896a5849877572f6872c778b292a0cd2182ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Wed, 5 Feb 2014 18:35:08 +0100 -Subject: [PATCH 09/12] eglfs: fix egl error for platforms only supporting one +Subject: [PATCH 08/11] eglfs: fix egl error for platforms only supporting one window/surface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8
@@ -27,10 +27,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp -index 2d36c0b..854531e 100644 +index c83b894..b937881 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp -@@ -74,6 +74,15 @@ void QEglFSWindow::create() +@@ -66,6 +66,15 @@ void QEglFSWindow::create() m_flags = Created;
@@ -46,16 +46,16 @@ index 2d36c0b..854531e 100644 if (window()->type() == Qt::Desktop) return; -@@ -85,7 +94,7 @@ void QEglFSWindow::create() - if (isRaster() && screen->compositingWindow()) +@@ -79,7 +88,7 @@ void QEglFSWindow::create() return; + } -#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) +#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB) // We can have either a single OpenGL window or multiple raster windows. // Other combinations cannot work. qFatal("EGLFS: OpenGL windows cannot be mixed with others."); -@@ -105,6 +114,11 @@ void QEglFSWindow::create() +@@ -99,6 +108,11 @@ void QEglFSWindow::create() resetSurface();
@@ -68,5 +68,5 @@ index 2d36c0b..854531e 100644 if (isRaster()) { -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch renamed from recipes-qt/qt5/qtbase-git/0011-QOpenGLPaintDevice-sub-area-support.patch +18 -18
@@ -1,7 +1,7 @@ -From 606dc31c85d97dff52b07ec9c896718c6533f670 Mon Sep 17 00:00:00 2001 +From d07f08f4180c1963c734a1f976e2848aa6c5f292 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <[email protected]> Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH 11/11] QOpenGLPaintDevice sub-area support +Subject: [PATCH 09/11] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer.
@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <[email protected]> 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp -index 6750458..034630a 100644 +index 59bca6e..ea0ee88 100644 --- a/src/gui/opengl/qopenglpaintdevice.cpp +++ b/src/gui/opengl/qopenglpaintdevice.cpp -@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate +@@ -103,6 +103,7 @@ class QOpenGLPaintDevicePrivate public: QOpenGLPaintDevicePrivate(const QSize &size);
@@ -31,7 +31,7 @@ index 6750458..034630a 100644 QSize size; QOpenGLContext *ctx; -@@ -159,6 +160,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) +@@ -151,6 +152,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) { }
@@ -44,7 +44,7 @@ index 6750458..034630a 100644 /*! Destroys the QOpenGLPaintDevice. */ -@@ -228,6 +235,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const +@@ -220,6 +227,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const return d_ptr->ctx; }
@@ -57,10 +57,10 @@ index 6750458..034630a 100644 Returns the pixel size of the paint device. diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h -index c05571c..01eb1bc 100644 +index e1be9b5..1a3ddbc 100644 --- a/src/gui/opengl/qopenglpaintdevice.h +++ b/src/gui/opengl/qopenglpaintdevice.h -@@ -62,12 +62,14 @@ public: +@@ -54,12 +54,14 @@ public: QOpenGLPaintDevice(); explicit QOpenGLPaintDevice(const QSize &size); QOpenGLPaintDevice(int width, int height);
@@ -76,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 81a0d82..ce57261 100644 +index 21bc4a9..ce008a4 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) +@@ -1999,7 +1999,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) d->vertexAttributeArraysEnabledState[i] = false;
@@ -90,7 +90,7 @@ index 81a0d82..ce57261 100644 d->width = sz.width(); d->height = sz.height(); d->mode = BrushDrawingMode; -@@ -2070,7 +2073,7 @@ void QOpenGL2PaintEngineEx::ensureActive() +@@ -2084,7 +2087,7 @@ void QOpenGL2PaintEngineEx::ensureActive() d->device->ensureActiveTarget(); d->transferMode(BrushDrawingMode);
@@ -99,7 +99,7 @@ index 81a0d82..ce57261 100644 d->needsSync = false; d->lastMaskTextureUsed = 0; d->shaderManager->setDirty(); -@@ -2113,6 +2116,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2127,6 +2130,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() if (bounds == QRect(0, 0, width, height)) { funcs.glDisable(GL_SCISSOR_TEST); } else {
@@ -107,7 +107,7 @@ index 81a0d82..ce57261 100644 funcs.glEnable(GL_SCISSOR_TEST); setScissor(bounds); } -@@ -2121,12 +2125,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2135,12 +2139,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) {
@@ -123,10 +123,10 @@ index 81a0d82..ce57261 100644 funcs.glScissor(left, bottom, width, height); diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h -index 4f0e2e5..f211de1 100644 +index 5ef0366..c5b517d 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h -@@ -264,6 +264,7 @@ public: +@@ -256,6 +256,7 @@ public: QOpenGL2PaintEngineEx* q; QOpenGLEngineShaderManager* shaderManager; QOpenGLPaintDevice* device;
@@ -135,10 +135,10 @@ index 4f0e2e5..f211de1 100644 QOpenGLContext *ctx; EngineMode mode; diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 0610ab6..ea1e3b2 100644 +index 6e16b2d..ddec9bb 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp -@@ -316,7 +316,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) +@@ -308,7 +308,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); if (pex != 0) {
@@ -148,5 +148,5 @@ index 0610ab6..ea1e3b2 100644 } else { if (m_vao.isCreated()) { -- -2.0.2 +2.1.1
recipes-qt/qt5/qtbase-git/0010-Always-build-uic.patch renamed from recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch +5 -5
@@ -1,7 +1,7 @@ -From 271db04ebfbaf67e2e8c30ff050510c5a42acfa4 Mon Sep 17 00:00:00 2001 +From e7345be82063524538573cbe3fed7b5280b49e3e Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH 11/12] Always build uic +Subject: [PATCH 10/11] Always build uic Even if we are not building gui or widgets. This tool is needed later as a native tool when compiling the target.
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 6a805a6..90623a6 100644 +index ab93641..a48606b 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent +@@ -161,7 +161,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent } } }
@@ -27,5 +27,5 @@ index 6a805a6..90623a6 100644 nacl: SUBDIRS -= src_network src_testlib -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase-git/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 8d8db9db8518289f4c1856dd3062c2e324c5c9be Mon Sep 17 00:00:00 2001 -From: Martin Jansa <[email protected]> -Date: Wed, 4 Jun 2014 15:26:11 +0200 -Subject: [PATCH 10/12] Revert "Use the "gcc" feature in simd.prf" - -This reverts commit 3b00cc480400d47c59c29d3507c7fcdc9be2a489. ---- - mkspecs/features/simd.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf -index 62a63f9..4f86f60 100644 ---- a/mkspecs/features/simd.prf -+++ b/mkspecs/features/simd.prf -@@ -18,7 +18,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) - # - # Set up compilers for SIMD (SSE/AVX, NEON etc) - # --gcc { # includes intel_icc and clang variants -+*-g++*|intel_icc|*-clang*|*-qcc* { - sse2 { - HEADERS += $$SSE2_HEADERS - --- -2.0.0 -
recipes-qt/qt5/qtbase-git/0010-qmake-don-t-build-it-in-configure-but-allow-to-build.patch renamed from recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +5 -5
@@ -1,7 +1,7 @@ -From ac507c953112630d7e929be35586e97396b76327 Mon Sep 17 00:00:00 2001 +From 846d20dc7d6f1c4815af77ac6a8217772781f1c7 Mon Sep 17 00:00:00 2001 From: Michael Krelin <[email protected]> Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build +Subject: [PATCH 10/10] qmake: don't build it in configure, but allow to build it separately * it is already built in qtbase-native, so we don't need it in configure
@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <[email protected]> 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index 3c0347a..a75ca11 100755 +index fe6bed4..9628be2 100755 --- a/configure +++ b/configure -@@ -3675,7 +3675,7 @@ setBootstrapEvalVariable() +@@ -3689,7 +3689,7 @@ setBootstrapEvalVariable() # build qmake
@@ -46,5 +46,5 @@ index 89d6ea5..7c605b9 100644 VPATH += \ ../src/corelib/global \ -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase-git/0011-configure-preserve-built-qmake-and-swap-with-native-.patch renamed from recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch +5 -5
@@ -1,7 +1,7 @@ -From 11bd34bfe629767ec32a36593386ef0655e86f24 Mon Sep 17 00:00:00 2001 +From 7d8c74816849c8ed0cc8b7c111bbf361cbcc747e Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Mon, 11 Nov 2013 20:22:34 -0500 -Subject: [PATCH 12/12] configure: preserve built qmake and swap with native +Subject: [PATCH 11/11] configure: preserve built qmake and swap with native one Let configure script build the real qmake, but right after it's built, swap
@@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <[email protected]> 1 file changed, 2 insertions(+) diff --git a/configure b/configure -index 3c0347a..c51f785 100755 +index fe6bed4..ea661a3 100755 --- a/configure +++ b/configure -@@ -3825,6 +3825,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3839,6 +3839,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; (cd "$outpath/qmake"; "$MAKE") || exit 2 fi # Build qmake
@@ -26,5 +26,5 @@ index 3c0347a..c51f785 100755 echo "Running configuration tests..." -- -2.0.0 +2.1.1
recipes-qt/qt5/qtbase-native_git.bb +6 -8
@@ -12,17 +12,15 @@ SRC_URI += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ - file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ - file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ - file://0008-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \ - file://0011-QOpenGLPaintDevice-sub-area-support.patch \ + file://0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ + file://0007-configure-bump-path-length-from-256-to-512-character.patch \ + file://0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ + file://0009-QOpenGLPaintDevice-sub-area-support.patch \ " # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ - file://0011-Always-build-uic.patch \ + file://0010-Always-build-uic.patch \ " do_install_append() {
@@ -31,4 +29,4 @@ do_install_append() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRCREV = "7a4dcbaabf037a6913a5662ebb74cc47e04673b9" +SRCREV = "8456adf0eeb9df8dd5f0547d4ad5a81888295f03"
recipes-qt/qt5/qtbase_git.bb +6 -8
@@ -12,17 +12,15 @@ SRC_URI += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ - file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ - file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ - file://0008-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \ - file://0011-QOpenGLPaintDevice-sub-area-support.patch \ + file://0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ + file://0007-configure-bump-path-length-from-256-to-512-character.patch \ + file://0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ + file://0009-QOpenGLPaintDevice-sub-area-support.patch \ " # specific for qtbase SRC_URI += "\ - file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ + file://0010-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ " -SRCREV = "7a4dcbaabf037a6913a5662ebb74cc47e04673b9" +SRCREV = "8456adf0eeb9df8dd5f0547d4ad5a81888295f03"
recipes-qt/qt5/qtconnectivity_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${BPN}.inc -SRCREV = "5fe214b8db0c192ea5520e7fdb20f546b02af88b" +SRCREV = "0f6e9cc18007c718de8ec399f5b60687ecffe9c2"
recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch new file +88 -0
88 lines not on this page · raw message
recipes-qt/qt5/qtdeclarative_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "e6bf3d444f3818145d7807ad37b6a0ab9f8d4a47" +SRCREV = "29b77e5e0759472ab1f7da1dd756b857d3b2ddd7"
recipes-qt/qt5/qtenginio_git.bb +2 -1
@@ -1,4 +1,5 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "07885f25ed57b98a695f28337fc4b91e611991aa" +QT_MODULE_BRANCH = "1.1" +SRCREV = "2b93eb45116e0bf2cc62f614de66cfd261c552df"
recipes-qt/qt5/qtgraphicaleffects_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "82abf6975b6737259ee656564e5ec7f8ad1d0508" +SRCREV = "bdd7e47ff1357bcc3b81c7ff5c10189c6a9b0290"
recipes-qt/qt5/qtimageformats_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "1c66c5786c35a7d841e0004757cff06da3f9a2cc" +SRCREV = "08f40bc0f00716c3a8cbda70ed00dc2f16515e85"
recipes-qt/qt5/qtlocation_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "f90f40de7006c4204df6aa414776616dc6f47f57" +SRCREV = "b90e043af09955d94a7a9555f11b5d6f3add4c3a"
recipes-qt/qt5/qtquick1_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "26e713cddcc8a62e49ce7a3352d3b5f13ffd7d52" +SRCREV = "af503cb8014c5b0fb2928ac1596a042d979a94a3"
recipes-qt/qt5/qtquickcontrols_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "8deeceb12e68dd429ee53d6ef667f1ec79bce4de" +SRCREV = "ebbf3629ae53755c3b5dd0912585a40545f391fc"
recipes-qt/qt5/qtscript_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "2b71f5f2ce41deb9baf91df2db9ec568e98814e8" +SRCREV = "14710df8fa3b8c31cdbf0243d268a006e667e13a"
recipes-qt/qt5/qtsensors_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "87b569ccc4df161e33d41f7a5f1f25eced6f65c3" +SRCREV = "4756a79d456d2fdd7aa1e5cb562a50165daf3d7f"
recipes-qt/qt5/qtserialport_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "19da18b96897c7d0b9dce2dd589d0135b397005e" +SRCREV = "ef8ed357881b212e2debe2ccf975996bca2331c2"
recipes-qt/qt5/qtsvg_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "35a2f0880831d38c60d2b4820dac808f48f6f3a8" +SRCREV = "bf249abee98727d517f52b1126dc7fda8af4e302"
recipes-qt/qt5/qtsystems_git.bb +2 -0
@@ -1,6 +1,8 @@ require qt5-git.inc require ${PN}.inc +QT_MODULE_BRANCH = "stable" + # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1
recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +15 -14
@@ -1,7 +1,7 @@ -From 50fdb63c074138f783a448bc2db97b6f0ccfefea Mon Sep 17 00:00:00 2001 +From ba804f69b32dc9a3554d2901cd1897039be33553 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 11 Sep 2013 18:30:08 +0200 -Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert +Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native is built without GUI support (no-png is set) and we still want to build
@@ -9,25 +9,26 @@ native lrelease + lupdate + lconvert tools. Upstream-Status: Pending -Signed-off-by: Martin Jansa <[email protected]> +Signed-off-by: Martin Jansa <[email protected]> --- - examples/examples.pro | 4 ++-- + examples/examples.pro | 3 ++- src/designer/src/src.pro | 16 +++++++++------- src/linguist/linguist.pro | 2 +- src/src.pro | 14 ++++++++------ tests/auto/auto.pro | 24 +++++++++++++----------- - 5 files changed, 33 insertions(+), 27 deletions(-) + 5 files changed, 33 insertions(+), 26 deletions(-) diff --git a/examples/examples.pro b/examples/examples.pro -index 4955969..8e86419 100644 +index 69365d1..da7b38b 100644 --- a/examples/examples.pro +++ b/examples/examples.pro -@@ -1,3 +1,3 @@ +@@ -1,4 +1,5 @@ TEMPLATE = subdirs -qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant -- +!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant +qtHaveModule(widgets): SUBDIRS += linguist uitools + + winrt: SUBDIRS -= assistant designer diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro index e02ca8e..49527c5 100644 --- a/src/designer/src/src.pro
@@ -74,7 +75,7 @@ index 3a70580..a977878 100644 qtNomakeTools( \ linguist \ diff --git a/src/src.pro b/src/src.pro -index a486d65..393eac2 100644 +index 722b32e..9453152 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,10 +4,12 @@ qtHaveModule(widgets) {
@@ -82,7 +83,7 @@ index a486d65..393eac2 100644 message("Some graphics-related tools are unavailable without PNG support") } else { - SUBDIRS = assistant \ -+ !linguistonly { ++ !linguistonly { + SUBDIRS = assistant \ pixeltool \ - qtestlib \
@@ -110,14 +111,14 @@ index a486d65..393eac2 100644 +!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus win32|winrt:SUBDIRS += windeployqt - winrt:SUBDIRS += winrtrunner qtd3dservice + winrt:SUBDIRS += winrtrunner -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag qtNomakeTools( \ pixeltool \ diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro -index c3acfe3..b48e711 100644 +index df240e3..27ee687 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,15 +1,17 @@
@@ -143,12 +144,12 @@ index c3acfe3..b48e711 100644 + qhelpindexmodel \ + qhelpprojectdata \ + cmake \ -+ installed_cmake \ ++ installed_cmake + qtdiag +} installed_cmake.depends = cmake -- -2.0.0 +2.1.1
recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch +3 -3
@@ -1,7 +1,7 @@ -From f375385c4795e3cd7df7aca2a4c769597164aaa8 Mon Sep 17 00:00:00 2001 +From ac277dcb43d53ce6d87c58f4afef295fe44a49ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Fri, 17 Jan 2014 14:33:19 +0100 -Subject: [PATCH 2/2] assistant/help: fix linking of dependent libraries +Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 + +LIBS += -lQt5CLucene -- -2.0.0 +2.1.1
recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch +2 -2
@@ -1,4 +1,4 @@ -From 6bb257d69ba7ac93b2b11aae35e0a523785d94ad Mon Sep 17 00:00:00 2001 +From b50a6739b3d38f06901e7812864e3f7122f3d0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH 3/3] add noqtwebkit configuration
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget -- -2.0.4 +2.1.1
recipes-qt/qt5/qttools-native_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "aa35d132010f4410d72e30d03e3dd713c7a2241d" +SRCREV = "a1ca5b48fafc536b619617f8fa6a3e4798283812"
recipes-qt/qt5/qttools_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "aa35d132010f4410d72e30d03e3dd713c7a2241d" +SRCREV = "a1ca5b48fafc536b619617f8fa6a3e4798283812"
recipes-qt/qt5/qtwayland-native_git.bb +1 -5
@@ -1,11 +1,7 @@ require qt5-git.inc require ${PN}.inc -# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 - -SRCREV = "98dca3b54f52f08117c1e0d3a1b4826ed12ef23f" -QT_MODULE_BRANCH = "5.4" +SRCREV = "5f718c7d04d44c3878018e8070b18cf0e7486eb0" # wayland-scanner and qtwaylandscanner must be in same path to work properly do_install_append() {
recipes-qt/qt5/qtwayland_git.bb +1 -5
@@ -1,11 +1,7 @@ require qt5-git.inc require ${PN}.inc -# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 -# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 - -SRCREV = "98dca3b54f52f08117c1e0d3a1b4826ed12ef23f" -QT_MODULE_BRANCH = "5.4" +SRCREV = "5f718c7d04d44c3878018e8070b18cf0e7486eb0" SRC_URI += " \ file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
recipes-qt/qt5/qtwebkit-examples_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "bce5056b9e16a943357e362455a46685d3f22093" +SRCREV = "70bd4d5253f134bf48a30544030bb832f1eba8b3"
recipes-qt/qt5/qtwebkit_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "db1ec4efadf930cd8088286605128ae1d01d23e8" +SRCREV = "3a51e3ee766490fe6f9ab9511d19e16f75e07db8"
recipes-qt/qt5/qtwebsockets_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "eb16b1970293dfeb5918751afbdf1fb7f62028e1" +SRCREV = "f6175568bb32b87a3d6cd55382fa1c8e1a1de2b4"
recipes-qt/qt5/qtx11extras_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "2d84caf5ef1b5dace0d678df4581db3c955be6ee" +SRCREV = "a21bbb45019e1bbc7b583811ff2e84757082a01a"
recipes-qt/qt5/qtxmlpatterns_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "e13d30be68228ccda3b6310ac44a84981b17f03b" +SRCREV = "eef0ba60200d8039c05073ce707c2352ac0944a8"
Signature · 1 line
2.1.1