From bb990f0a9c92869f16a2841ac0fde72b899ae3b7 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Thu, 26 Sep 2024 12:21:54 +0200
Subject: [PATCH] QmlDesignerBase: Fix (qbs) build

There's been another "refactoring", i.e. randomly moving files around and
using wrong include types.

Change-Id: Ia48d454f212acbcd489b48d15c196e4e5e20a8b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../qmldesignerbase/qmldesignerbase.qbs       | 19 +++++++++++++++++--
 .../buildsystem/projectitem/converters.cpp    |  2 +-
 .../projectitem/qmlprojectitem.cpp            |  4 ++--
 .../qmlprojectexporter/exporter.cpp           |  4 ++--
 .../qmlprojectexporter/filegenerator.cpp      |  8 ++++----
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/plugins/qmldesignerbase/qmldesignerbase.qbs b/src/plugins/qmldesignerbase/qmldesignerbase.qbs
index 5b029f66dc1..275b1a62370 100644
--- a/src/plugins/qmldesignerbase/qmldesignerbase.qbs
+++ b/src/plugins/qmldesignerbase/qmldesignerbase.qbs
@@ -7,6 +7,9 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "QtSupport" }
     Depends { name: "Qt.quickwidgets" }
+    Depends { name: "Qt.gui-private" }
+
+    cpp.includePaths: ["settings", "studio", "utils"]
 
     files: [
         "qmldesignerbase_global.h",
@@ -17,6 +20,8 @@ QtcPlugin {
     Group {
         prefix: "studio/"
         files: [
+            "studioquickutils.cpp",
+            "studioquickutils.h",
             "studioquickwidget.cpp",
             "studioquickwidget.h",
             "studiosettingspage.cpp",
@@ -25,6 +30,8 @@ QtcPlugin {
             "studiostyle.h",
             "studiostyle_p.cpp",
             "studiostyle_p.h",
+            "studiovalidator.cpp",
+            "studiovalidator.h",
         ]
     }
     Group {
@@ -32,10 +39,18 @@ QtcPlugin {
         files: [
             "designerpaths.cpp",
             "designerpaths.h",
-            "designersettings.cpp",
-            "designersettings.h",
             "qmlpuppetpaths.cpp",
             "qmlpuppetpaths.h",
+            "windowmanager.cpp",
+            "windowmanager.h",
         ]
+        Group {
+            prefix: "settings/"
+            files: [
+                "designersettings.cpp",
+                "designersettings.h",
+                "qmldesignersettings_global.h",
+            ]
+        }
     }
 }
diff --git a/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp b/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
index 51ee81c7d54..dc8f1d9a266 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
+++ b/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
@@ -3,7 +3,7 @@
 
 #include "converters.h"
 #include "utils/algorithm.h"
-#include "qmlprojectexporter/filetypes.h"
+#include "../../qmlprojectexporter/filetypes.h"
 
 #include <QJsonDocument>
 
diff --git a/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp b/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp
index 65c310ce497..eb3144a465e 100644
--- a/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp
+++ b/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp
@@ -8,8 +8,8 @@
 
 #include "converters.h"
 
-#include <qmlproject.h>
-#include <qmlprojectconstants.h>
+#include "../../qmlproject.h"
+#include "../../qmlprojectconstants.h"
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectexporter/exporter.cpp b/src/plugins/qmlprojectmanager/qmlprojectexporter/exporter.cpp
index d4f7b752588..205dcdd2ab9 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectexporter/exporter.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectexporter/exporter.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "exporter.h"
-#include "qmlbuildsystem.h"
 
-#include "projectitem/qmlprojectitem.h"
+#include "../buildsystem/qmlbuildsystem.h"
+#include "../buildsystem/projectitem/qmlprojectitem.h"
 
 namespace QmlProjectManager {
 namespace QmlProjectExporter {
diff --git a/src/plugins/qmlprojectmanager/qmlprojectexporter/filegenerator.cpp b/src/plugins/qmlprojectmanager/qmlprojectexporter/filegenerator.cpp
index 392b18f4ccc..ed95683a49f 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectexporter/filegenerator.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectexporter/filegenerator.cpp
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "filegenerator.h"
-#include "qmlbuildsystem.h"
+
+#include "../buildsystem/qmlbuildsystem.h"
+#include "../qmlprojectconstants.h"
+#include "../qmlprojectmanagertr.h"
 
 #include <projectexplorer/projectmanager.h>
 
-#include <qmlprojectmanager/qmlprojectconstants.h>
-#include <qmlprojectmanager/qmlprojectmanagertr.h>
-
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>