diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-11-15 10:02:30 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-11-16 08:34:28 +0000 |
| commit | 29243ef18ca9de972aed52017d2d8089dda08d50 (patch) | |
| tree | 77e976cdf18960b98e9d3aae3e318c60d99f29f3 | |
| parent | 067ff7a8931039dbe4242217d0766aea97e4f1c6 (diff) | |
| download | meta-qt5-29243ef18ca9de972aed52017d2d8089dda08d50.tar.gz | |
qt5: update submodules
Change-Id: Iec217181d48ef840afedadf7725efdf30474e46c
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtconnectivity_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtsensors_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtserialport_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebchannel_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 1950c5a6..0a93ebc8 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -247,4 +247,4 @@ fakeroot do_generate_qt_environment_file() { | |||
| 247 | 247 | ||
| 248 | addtask generate_qt_environment_file after do_install before do_package | 248 | addtask generate_qt_environment_file after do_install before do_package |
| 249 | 249 | ||
| 250 | SRCREV = "65858057f0f76908e4734fd06e0cfaeb2ee233cd" | 250 | SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 45384f29..38d82410 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -123,4 +123,4 @@ do_install() { | |||
| 123 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 123 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | SRCREV = "65858057f0f76908e4734fd06e0cfaeb2ee233cd" | 126 | SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 6b54e798..308d8d2f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -216,4 +216,4 @@ do_install_append() { | |||
| 216 | 216 | ||
| 217 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 217 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 218 | 218 | ||
| 219 | SRCREV = "65858057f0f76908e4734fd06e0cfaeb2ee233cd" | 219 | SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index b9c1641c..665359b2 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
| @@ -28,4 +28,4 @@ do_configure_prepend() { | |||
| 28 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro | 28 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | SRCREV = "7b443cd0fdd1940a8bfaad73df5e309a52b7669f" | 31 | SRCREV = "d884d20c5530b67fbd2fba35cdb71a9f969196be" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 105304e9..e001f9b0 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
| @@ -42,6 +42,6 @@ do_install_append_class-nativesdk() { | |||
| 42 | 42 | ||
| 43 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 43 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
| 44 | 44 | ||
| 45 | SRCREV = "c5755267227a81e35052eb447895aa2f1428ebe1" | 45 | SRCREV = "2a992040e2ef3f9dab087be3bfac05e28596672b" |
| 46 | 46 | ||
| 47 | BBCLASSEXTEND =+ "native nativesdk" | 47 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 281e7b1c..351e807c 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
| @@ -29,4 +29,4 @@ do_configure_prepend() { | |||
| 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" |
| 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" |
| 31 | 31 | ||
| 32 | SRCREV = "3abe52c28d9d960b284586e5b6f0277f91362ee9" | 32 | SRCREV = "de5be121d84b062f1b72c91dddc877e5e88babc0" |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 523820ed..24551eb3 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
| @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 13 | 13 | ||
| 14 | DEPENDS += "qtbase qtdeclarative" | 14 | DEPENDS += "qtbase qtdeclarative" |
| 15 | 15 | ||
| 16 | SRCREV = "ecd018fe2ee4508e094f631d882ecc1360abec01" | 16 | SRCREV = "5a57beaaa5f637070ccbf30d79ad27861134c7a8" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index b65cd0a3..ef780d43 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
| @@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 15 | 15 | ||
| 16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
| 17 | 17 | ||
| 18 | SRCREV = "dee818e77a6cf9a6c164fbc7ee132fe875f7f998" | 18 | SRCREV = "0b9f41c28cece4fe51011083e646aba405ec3a65" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index a5ad0755..fbebc96d 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -35,6 +35,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
| 35 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 35 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
| 36 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" | 36 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" |
| 37 | 37 | ||
| 38 | SRCREV = "01a560811df01514673315dc461ad7f51eff1dfa" | 38 | SRCREV = "8575ed82ff0dd43aed8f5de67b4cfef06fec8c33" |
| 39 | 39 | ||
| 40 | BBCLASSEXTEND = "native nativesdk" | 40 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index c4d71cca..2ed752f0 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
| @@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 17 | 17 | ||
| 18 | DEPENDS += "qtdeclarative qtwebsockets" | 18 | DEPENDS += "qtdeclarative qtwebsockets" |
| 19 | 19 | ||
| 20 | SRCREV = "2d29a774dd165ee2acd0b607b7e0d02a37c5fea5" | 20 | SRCREV = "31eb0d8c7d78fe60dbad94091a56e97b4fcaa52b" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index c221d163..75032c26 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -122,7 +122,7 @@ SRC_URI += " \ | |||
| 122 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 122 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
| 123 | " | 123 | " |
| 124 | 124 | ||
| 125 | SRCREV_qtwebengine = "37c8cc637d8f2e06b715362d5b8fa491e1ce93ff" | 125 | SRCREV_qtwebengine = "15ded5ca62f53a01f85a52326f0b335a8a012bbd" |
| 126 | # This is in git submodule, but we're using the latest in 49-based | 126 | # This is in git submodule, but we're using the latest in 49-based |
| 127 | # SRCREV_chromium = "c109a95a067af783e48f93d1cdeca870cda98878" | 127 | # SRCREV_chromium = "c109a95a067af783e48f93d1cdeca870cda98878" |
| 128 | SRCREV_chromium = "881a7672e23192eaf7e1ac2f94e086b560104f10" | 128 | SRCREV_chromium = "881a7672e23192eaf7e1ac2f94e086b560104f10" |
