diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-01 16:46:14 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-09 12:22:36 +0000 |
| commit | c4a0a450b4275cc3869cf389c92e86b62f09fcea (patch) | |
| tree | 6705cbb48ae3d433639bad3e78e239d210e13dee /recipes-qt/qt5/qttools_git.bb | |
| parent | 4e113c7b8e0a7512d2f0ad306decc8b4885ef807 (diff) | |
| download | meta-qt5-c4a0a450b4275cc3869cf389c92e86b62f09fcea.tar.gz | |
qt5: update submodules
New configuration system is now used for more modules, so add new
EXTRA_QMAKEVARS_CONFIGURE variable that can be used for configure
modules with -[no-]feature flags.
SHA1s are now from the release 5.8.0 branches, so need to add "nobranch=1"
option so that there is no build break when release branches are removed.
Add recipe for QtGamepad module, it's already used by Qt3D.
Change-Id: I152b3b66b68c802d07445f4a7f1e81802308418e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qttools_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 3d77ec70..c3f653d6 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -30,6 +30,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
| 30 | 30 | ||
| 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
| 32 | 32 | ||
| 33 | SRCREV = "b8113e90e2a1d9ea38a478990a93615f432ac35b" | 33 | SRCREV = "c3b5247161eff3b521381a9ada14b180e330a037" |
| 34 | 34 | ||
| 35 | BBCLASSEXTEND = "native nativesdk" | 35 | BBCLASSEXTEND = "native nativesdk" |