diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-13 14:53:16 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-15 08:31:24 +0200 |
| commit | 85e33e5c9998d15fc2af4682b72913bc2f6ea489 (patch) | |
| tree | c4f0b9a9ba26bebfcbb717c9d939b4ccc97b4467 /classes | |
| parent | 0cc8a8a21e1ba7ffa237c64608b2a6678897c096 (diff) | |
| parent | 251beba0ca5f7fae85b8fd9c20851c53347c9722 (diff) | |
| download | meta-qt5-85e33e5c9998d15fc2af4682b72913bc2f6ea489.tar.gz | |
Merge remote-tracking branch 'qtyocto/5.8' into 5.9
* qtyocto/5.8 (upstream/master):
qtwebkit: depends on gperf-native
qtwebengine: disable generate_character_data
qtwayland: fix build without xkbcommon-evdev
qtwayland: Add libxkbcommon in the dependencies
qtbase: create empty oe-device-extra.pri
cmake_qt5.bbclass: add qtbase-native to DEPENDS
Upgrade to Qt 5.8
qtbase: Remove comments about ICU and QtWebKit
qtwebkit: Always enable icu in QT_CONFIG
qtwebengine: use QT_GIT_PROTOCOL variable
Change-Id: Idf617e8301dfa820b8fbbbdb2e09e53d18bcc8ae
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cmake_qt5.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass index 3180fd6d..5d605a68 100644 --- a/classes/cmake_qt5.bbclass +++ b/classes/cmake_qt5.bbclass | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | inherit cmake | 1 | inherit cmake |
| 2 | inherit qmake5_paths | 2 | inherit qmake5_paths |
| 3 | 3 | ||
| 4 | DEPENDS_prepend = "qtbase " | 4 | DEPENDS_prepend = "qtbase qtbase-native " |
| 5 | 5 | ||
| 6 | EXTRA_OECMAKE_prepend = " \ | 6 | EXTRA_OECMAKE_prepend = " \ |
| 7 | -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ | 7 | -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ |