diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2020-11-05 07:59:12 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-11-06 09:43:07 +0200 |
commit | f17ee34d01d7b06fce8d815f8ac990fca52c1678 (patch) | |
tree | f97fae0254ceda01d3e95afc29982a6ea0deee3e | |
parent | ab95b08fd00806bc807bfdc05682b4736b1fde49 (diff) |
qt6: add support for selecting Qt license type
Selection can be made between opensource and commercial licensing.
Currently the licensing choise does not affect the build in any way.
Task-number: QTBUG-87188
Change-Id: I008a31b2ad6c50b4f94d80de3fbd0a69fc1065e1
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | conf/layer.conf | 1 | ||||
-rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index db9aae9..805ce42 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -38,3 +38,4 @@ IMAGE_FEATURES[validitems] += "qtcreator-debug" QT_GIT_PROJECT ?= "qt" QT_GIT ?= "git://code.qt.io" QT_GIT_PROTOCOL ?= "git" +QT_EDITION ?= "opensource" diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 0eeeb20..f8836a2 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -111,6 +111,7 @@ PACKAGECONFIG[sql-sqlite] = "-DFEATURE_sql_sqlite=ON,-DFEATURE_sql_sqlite=OFF,sq EXTRA_OECMAKE += "\ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ + -DQT_EDITION=${QT_EDITION} \ " EXTRA_OECMAKE_append_class-target = "\ |