diff options
| author | Andrej Valek <andrej.valek@siemens.com> | 2021-08-27 14:51:42 +0200 |
|---|---|---|
| committer | Jukka Jokiniva <jukka.jokiniva@qt.io> | 2021-09-01 05:33:49 +0000 |
| commit | 468e20d236516d6528b4cd7fcc22e4c260080019 (patch) | |
| tree | 3a655a4b8890110af13cba45a3d0877893fca7b8 | |
| parent | d614d4c4a635952be37df6420a54aa07aa8018d3 (diff) | |
qt5: set default qt edition to commercial for lts releasesv5.15.6-lts
Even if QT_EDITION was overridden via (= "commercial"), it always stayed as
opensource. The problem was, that qt5-tls.inc file was included on recipe
level, means no transfer to upper layer. It created a variable
inconsistancy.
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Change-Id: I3b26c6545a0a9b72a1f8e0559acc011f0cf18e44
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | conf/layer.conf | 4 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt5-lts.inc | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index 7b3089dc..ac19c93a 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -38,4 +38,6 @@ IMAGE_FEATURES[validitems] += "qtcreator-debug" QT_GIT_PROJECT ?= "qt" QT_GIT ?= "git://code.qt.io/${QT_GIT_PROJECT}" QT_GIT_PROTOCOL ?= "git" -QT_EDITION ?= "opensource" + +# Default to commercially licensed Qt LTS +QT_EDITION ?= "commercial" diff --git a/recipes-qt/qt5/qt5-lts.inc b/recipes-qt/qt5/qt5-lts.inc index 30c4a591..0ee10b2e 100644 --- a/recipes-qt/qt5/qt5-lts.inc +++ b/recipes-qt/qt5/qt5-lts.inc @@ -7,6 +7,3 @@ QT_GIT_PROTOCOL = "${QT_LTS_GIT_PROTOCOL}" QT_MODULE_BRANCH = "tqtc/lts-5.15.6" QT_LTS_MODULE_REPO ?= "tqtc-${QT_MODULE}.git" QT_MODULE_REPO = "${QT_LTS_MODULE_REPO}" - -# Default to commercially licensed Qt LTS -QT_EDITION = "commercial" |