From 6233c8ce80a6d03cb7c88adecc34cdad938863b1 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 15 Sep 2023 07:39:08 +0200 Subject: [PATCH] Qbs: Fix build after DS merge Change-Id: I5188d1654584ba88789472fe1f0c81b2b1a33a55 Reviewed-by: Christian Kandeler --- src/libs/advanceddockingsystem/advanceddockingsystem.qbs | 2 +- src/plugins/qmldesignerbase/qmldesignerbase.qbs | 6 ++++-- src/plugins/qmlpreview/qmlpreview.qbs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libs/advanceddockingsystem/advanceddockingsystem.qbs b/src/libs/advanceddockingsystem/advanceddockingsystem.qbs index e603a039827..c04b8e0fe33 100644 --- a/src/libs/advanceddockingsystem/advanceddockingsystem.qbs +++ b/src/libs/advanceddockingsystem/advanceddockingsystem.qbs @@ -7,7 +7,7 @@ QtcLibrary { cpp.defines: base.concat("ADVANCEDDOCKINGSYSTEM_LIBRARY") cpp.includePaths: base.concat([".", linux.prefix]) - Depends { name: "Qt"; submodules: ["widgets", "xml"] } + Depends { name: "Qt"; submodules: ["quickwidgets", "widgets", "xml"] } Depends { name: "Utils" } Group { diff --git a/src/plugins/qmldesignerbase/qmldesignerbase.qbs b/src/plugins/qmldesignerbase/qmldesignerbase.qbs index 334bebe1964..5b029f66dc1 100644 --- a/src/plugins/qmldesignerbase/qmldesignerbase.qbs +++ b/src/plugins/qmldesignerbase/qmldesignerbase.qbs @@ -17,12 +17,14 @@ QtcPlugin { Group { prefix: "studio/" files: [ + "studioquickwidget.cpp", + "studioquickwidget.h", "studiosettingspage.cpp", "studiosettingspage.h", "studiostyle.cpp", "studiostyle.h", - "studioquickwidget.cpp", - "studioquickwidget.h", + "studiostyle_p.cpp", + "studiostyle_p.h", ] } Group { diff --git a/src/plugins/qmlpreview/qmlpreview.qbs b/src/plugins/qmlpreview/qmlpreview.qbs index e44f432c41a..b3dcc830f5a 100644 --- a/src/plugins/qmlpreview/qmlpreview.qbs +++ b/src/plugins/qmlpreview/qmlpreview.qbs @@ -16,7 +16,7 @@ QtcPlugin { Depends { name: "Qt" - submodules: ["core"] + submodules: ["core", "qml-private"] } Group {