diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-05-22 20:34:55 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-05-22 17:52:08 +0000 |
| commit | 5c9a409813ee5935f99e0e0e8955a470863b8210 (patch) | |
| tree | afeb6bf2cb944b0f81bd9b173816e4f22e75bc13 | |
| parent | fb35ac6d1bf926e47a8d80ca4a900717645cc502 (diff) | |
| download | meta-qt5-5c9a409813ee5935f99e0e0e8955a470863b8210.tar.gz | |
qt5: update qttools & qtquickcontrols
Late submodule updates for 5.9.0 RC (snapshot 1)
Change-Id: If1b07b33e2c0efc196aee03cdf2e67fddca47858
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qt5/qtquickcontrols_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 9d4ef6c6..83ed908d 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
| @@ -26,4 +26,4 @@ SRC_URI += " \ | |||
| 26 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ | 26 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ |
| 27 | " | 27 | " |
| 28 | 28 | ||
| 29 | SRCREV = "e6208de2d0877d9025365ae7e89a6bf2caeda8fa" | 29 | SRCREV = "dacb91916b202208681471ba764504c7c7d086f0" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index f3880598..9ca90a2c 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -27,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
| 27 | 27 | ||
| 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
| 29 | 29 | ||
| 30 | SRCREV = "0008da1767759592b372d355d6b1ee54a0e82036" | 30 | SRCREV = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9" |
| 31 | 31 | ||
| 32 | BBCLASSEXTEND = "native nativesdk" | 32 | BBCLASSEXTEND = "native nativesdk" |
| 33 | 33 | ||