aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Juntunen <janne.juntunen@qt.io>2021-09-07 09:22:45 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-09-13 10:08:28 +0000
commita8f85381970d7e50e847cc311e276c550be0ca8c (patch)
tree6f4545806fb38ca3b2de4d60e78a75ceb95dd439
parent84eeee07b2bb88179e38dbb5aa1f982fcbbad278 (diff)
Appcontroller: switch from qmake to cmake
Latest version of appcontroller now has support for cmake and support for qmake has been removed. Task-number: QTBUG-86119 Change-Id: If9ce8a44aafc061c344cc4473f7aa31f3d267449 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 97042e9fb6b547175bf84e3881a41727a06cc611) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
index d02339e9..55ec5f39 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
@@ -31,13 +31,13 @@ DESCRIPTION = "Boot to Qt Appcontroller"
LICENSE = "The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = "file://main.cpp;md5=f25c7436dbc72d4719a5684b28dbcf4b;beginline=1;endline=17"
-inherit qt6-qmake
+inherit qt6-cmake
require recipes-qt/qt6/qt6-git.inc
QT_GIT_PROJECT = "qt-apps"
-QT_MODULE_BRANCH = "5.15"
+QT_MODULE_BRANCH = "dev"
-SRCREV = "474fa4b7aee62e704158d213d9e67eba74c69401"
+SRCREV = "d9978f10a0ef60563fdff8f8eadcb5a678b9a5b1"
DEPENDS = "qtbase"
RDEPENDS_${PN} = " \