diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-29 12:48:12 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-29 12:52:10 +0200 |
| commit | a358108b09762390ec951f560540bb99aaf9f2a2 (patch) | |
| tree | 6d9e6c078f46403bb2e76a25f4aa56c990c23083 /conf | |
| parent | c32de2f746d944f515e9e47dd330dfb64b3ca280 (diff) | |
| parent | ce766374432309b85fdcfe8ef287dbb2ef11b337 (diff) | |
| download | meta-qt5-a358108b09762390ec951f560540bb99aaf9f2a2.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.10
* qtyocto/upstream/master:
qt: refresh remaining patches and tags in meta-qt5 repos
qtwebengine: explicitly depend on bison-native
qtmqtt: add recipe
qtbase: fix a regression
qtbase: introduce QT_EDITION
packagegroup-qt5-qtcreator-debug: remove qtdeclarative-plugins
Conflicts:
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtserialbus_git.bb
Task-number: QTBUG-65164
Change-Id: Ifdb2bba80e68de28ec818fff2b2716645eb4d9c5
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/layer.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index 7eb3b2db..7751ce2f 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
| @@ -36,3 +36,4 @@ IMAGE_FEATURES[validitems] += "qtcreator-debug" | |||
| 36 | QT_GIT ?= "git://github.com/qt" | 36 | QT_GIT ?= "git://github.com/qt" |
| 37 | QT_LABS_GIT ?= "git://github.com/qt-labs" | 37 | QT_LABS_GIT ?= "git://github.com/qt-labs" |
| 38 | QT_GIT_PROTOCOL ?= "git" | 38 | QT_GIT_PROTOCOL ?= "git" |
| 39 | QT_EDITION ?= "opensource" | ||