diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-16 14:49:56 +0200 |
---|---|---|
committer | Teemu Holappa <teemu.holappa@theqtcompany.com> | 2016-03-23 09:59:50 +0000 |
commit | 2c1c64fbcce018dd02fcf03bd3fcc25127dee438 (patch) | |
tree | b77d8e57493867f598aa6d9b81d94fa5b1b3aa5e | |
parent | bea48bd0716cc8c60d4e3b3ddb497555f1905b33 (diff) |
qt5: 5.6.0 branches were removed, using 5.6 instead
Change-Id: Ia0fd4493c4b87aa3bc48633ceca81fbc2f46ad7a
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
25 files changed, 0 insertions, 25 deletions
diff --git a/recipes-qt/qt5-addons/qtcharts_git.bb b/recipes-qt/qt5-addons/qtcharts_git.bb index 090276b9..5e95d149 100644 --- a/recipes-qt/qt5-addons/qtcharts_git.bb +++ b/recipes-qt/qt5-addons/qtcharts_git.bb @@ -26,7 +26,6 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3 inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -QT_MODULE_BRANCH = "5.6.0" SRCREV = "f4ba2fb9840279f986bd11ab6860e6a3125d9599" DEPENDS = "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 312f6b26..a63c8b0f 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -19,7 +19,6 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index 18188177..7cec73a4 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -25,5 +25,4 @@ SRC_URI_append_class-target = " \ file://0001-Remove-qgltf.patch \ " -QT_MODULE_BRANCH = "5.6.0" SRCREV = "7a208d76ed96bb506899becfe680df06f95451c7" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index ee146647..76c3986d 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -19,7 +19,6 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 0b4774a0..eaab0a61 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -45,7 +45,6 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -QT_MODULE_BRANCH = "5.6.0" SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" # Temporarily here, until merged upstream diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend index 94784285..0a8d678e 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index f9e92da0..6841ebeb 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -21,5 +21,4 @@ PACKAGECONFIG += "bluez4" -QT_MODULE_BRANCH = "5.6.0" SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 626014a2..804c736d 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "dc558b69f083c89aa8c02952e5f167405939a61a" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend index 7f854d57..d5da008d 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "4b8e9a348ca379b203c26ff14dd236267dd60646" diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index f3895a63..4213bc99 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 3308e331..3b3bae1e 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -24,5 +24,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -QT_MODULE_BRANCH = "5.6.0" SRCREV = "ca4bce553d03a64fa119650990083267ea9c8d31" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index 1793fddd..ca77e8c8 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -21,5 +21,4 @@ PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}" -QT_MODULE_BRANCH = "5.6.0" SRCREV = "9985224a89b830dc182b428f491b6187d6f0e1ba" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index c7df8574..7d64fdc4 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index d570ec26..c9c89edb 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -22,5 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -QT_MODULE_BRANCH = "5.6.0" SRCREV = "7197e7f4b385315cb241043495cbfad58deb911a" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index c8337309..1605b7bf 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -31,5 +31,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -QT_MODULE_BRANCH = "5.6.0" SRCREV = "48f32572590e45a57573944c0822855819d138df" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index 7e72190b..e0b0c7e7 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "03d492e49e74eefa1c83e37e833d862f4b9f1e45" diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index 27ed9e20..56a80d92 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 7244baf1..4200c4db 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "9904992dc4eb9a5958fcfbac238374ff38498143" diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index 9c5261aa..5045c671 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 57cc2e73..9e48cabd 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 57cc2e73..9e48cabd 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index 2179f585..ac958c02 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 381bbbd0..0f684ccc 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -25,6 +25,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -QT_MODULE_BRANCH = "5.6.0" SRCREV_qtwebengine = "5c4ae298b0a3d75c4c5ea8aef0595914ab25607f" SRCREV_chromium = "e63eb5276c8d141853e2c26bf1bac469ed60465f" diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend index ea08e2e6..528e5b62 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bbappend +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "88946bbe209cb6148b4a3284077bb9a06c7bc1ef" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index f45b6337..287ed426 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend @@ -19,5 +19,4 @@ ## ############################################################################## -QT_MODULE_BRANCH = "5.6.0" SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915" |