feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix qbs build

Browse Source 
Was broken in an impressive number of ways by latest Design Studio
merge.

Change-Id: I25f56827074a8c16a1a9c18884e1f63e8eaf6ef1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2023-05-23 08:49:27 +02:00
parent eebe7f86f3
commit 8e7ad13ad2
9 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/advanceddockingsystem/advanceddockingsystem.qbs
View File

@@ -7,7 +7,7 @@ QtcLibrary {
cpp.defines: base.concat("ADVANCEDDOCKINGSYSTEM_LIBRARY") cpp.defines: base.concat("ADVANCEDDOCKINGSYSTEM_LIBRARY")
cpp.includePaths: base.concat([".", linux.prefix]) cpp.includePaths: base.concat([".", linux.prefix])
Depends { name: "Qt"; submodules: ["widgets", "core", "gui"] } Depends { name: "Qt"; submodules: ["widgets", "xml"] }
Depends { name: "Utils" } Depends { name: "Utils" }
Group { Group {
@@ -31,6 +31,7 @@ QtcLibrary {
"floatingdockcontainer.cpp", "floatingdockcontainer.h", "floatingdockcontainer.cpp", "floatingdockcontainer.h",
"floatingdragpreview.cpp", "floatingdragpreview.h", "floatingdragpreview.cpp", "floatingdragpreview.h",
"iconprovider.cpp", "iconprovider.h", "iconprovider.cpp", "iconprovider.h",
"workspace.cpp", "workspace.h",
"workspacedialog.cpp", "workspacedialog.h", "workspacedialog.cpp", "workspacedialog.h",
"workspacemodel.cpp", "workspacemodel.h", "workspacemodel.cpp", "workspacemodel.h",
"workspaceview.cpp", "workspaceview.h", "workspaceview.cpp", "workspaceview.h",

2
src/libs/utils/utils.qbs
View File

@@ -337,7 +337,7 @@ Project {
"headerviewstretcher.h", "headerviewstretcher.h",
"uncommentselection.cpp", "uncommentselection.cpp",
"uncommentselection.h", "uncommentselection.h",
"uniqueobjectptr.h" "uniqueobjectptr.h",
"unixutils.cpp", "unixutils.cpp",
"unixutils.h", "unixutils.h",
"url.cpp", "url.cpp",

21
src/plugins/qmldesignerbase/qmldesignerbase.qbs
View File

@@ -16,14 +16,25 @@ QtcPlugin {
] ]
Group { Group {
prefix: "utils/" prefix: "studio/"
files: [ files: [
"designersettings.cpp", "studiosettingspage.cpp",
"designersettings.h", "studiosettingspage.h",
"qmlpuppetpaths.cpp", "studiostyle.cpp",
"qmlpuppetpaths.h", "studiostyle.h",
"studioquickwidget.cpp", "studioquickwidget.cpp",
"studioquickwidget.h", "studioquickwidget.h",
] ]
} }
Group {
prefix: "utils/"
files: [
"designerpaths.cpp",
"designerpaths.h",
"designersettings.cpp",
"designersettings.h",
"qmlpuppetpaths.cpp",
"qmlpuppetpaths.h",
]
}
} }

2
src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
View File

@@ -3,7 +3,7 @@
#include "qmldesignerbaseplugin.h" #include "qmldesignerbaseplugin.h"
#include "studiosettingspage.h" #include "studio/studiosettingspage.h"
#include "studio/studiostyle.h" #include "studio/studiostyle.h"
#include "utils/designersettings.h" #include "utils/designersettings.h"

2
src/plugins/qmldesignerbase/studio/studiostyle.h
View File

@@ -3,7 +3,7 @@
#pragma once #pragma once
#include "qmldesignerbase_global.h" #include "../qmldesignerbase_global.h"
#include <QProxyStyle> #include <QProxyStyle>

2
src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "qmlbuildsystem.h" #include "qmlbuildsystem.h"
#include "qmlprojectconstants.h" #include "../qmlprojectconstants.h"
#include <QtCore5Compat/qtextcodec.h> #include <QtCore5Compat/qtextcodec.h>
#include <qmljs/qmljsmodelmanagerinterface.h> #include <qmljs/qmljsmodelmanagerinterface.h>

1
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
View File

@@ -26,7 +26,6 @@ QtcPlugin {
"qmlprojectconstants.h", "qmlprojectconstants.h",
"qmlprojectmanager_global.h", "qmlprojectmanagertr.h", "qmlprojectmanager_global.h", "qmlprojectmanagertr.h",
"qmlprojectmanagerconstants.h", "qmlprojectmanagerconstants.h",
"qmlprojectnodes.cpp", "qmlprojectnodes.h",
"qmlprojectplugin.cpp", "qmlprojectplugin.h", "qmlprojectplugin.cpp", "qmlprojectplugin.h",
"qmlprojectrunconfiguration.cpp", "qmlprojectrunconfiguration.h", "qmlprojectrunconfiguration.cpp", "qmlprojectrunconfiguration.h",
project.ide_source_tree + "/src/share/3rdparty/studiofonts/studiofonts.qrc" project.ide_source_tree + "/src/share/3rdparty/studiofonts/studiofonts.qrc"

2
tests/auto/qml/qml.qbs
View File

@@ -7,7 +7,7 @@ Project {
// "qmldesigner/qmldesigner.qbs", // "qmldesigner/qmldesigner.qbs",
"qmleditor/qmleditor.qbs", "qmleditor/qmleditor.qbs",
"qmljssimplereader/qmljssimplereader.qbs", "qmljssimplereader/qmljssimplereader.qbs",
"qmlprojectmanager/qmlprojectmanager.qbs", // "qmlprojectmanager/qmlprojectmanager.qbs",
"qrcparser/qrcparser.qbs", "qrcparser/qrcparser.qbs",
"reformatter/reformatter.qbs", "reformatter/reformatter.qbs",
"persistenttrie/persistenttrie.qbs" "persistenttrie/persistenttrie.qbs"

4
tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
View File

@@ -4,7 +4,7 @@ QtcAutotest {
name: "QmlProjectManager file format autotest" name: "QmlProjectManager file format autotest"
Depends { name: "QmlJS" } Depends { name: "QmlJS" }
Depends { name: "Utils" } Depends { name: "Utils" }
property path fileFormatDir: project.ide_source_tree + "/src/plugins/qmlprojectmanager/fileformat" property path fileFormatDir: project.ide_source_tree + "/src/plugins/qmlprojectmanager/buildsystem/projectitem"
files: "tst_fileformat.cpp" files: "tst_fileformat.cpp"
Group { Group {
name: "Files from QmlProjectManager" name: "Files from QmlProjectManager"
@@ -12,8 +12,6 @@ QtcAutotest {
files: [ files: [
"filefilteritems.cpp", "filefilteritems.cpp",
"filefilteritems.h", "filefilteritems.h",
"qmlprojectfileformat.cpp",
"qmlprojectfileformat.h",
"qmlprojectitem.cpp", "qmlprojectitem.cpp",
"qmlprojectitem.h", "qmlprojectitem.h",
] ]