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

qbs build: Remove unneeded Project items

Browse Source 
Also update type descriptions.

Change-Id: I2b7d8814913cfb72cb8280601338ab763d8fabe6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2023-09-14 08:22:23 +02:00
parent a7bbb986dd
commit c816a9b523
23 changed files with 2519 additions and 2612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/qml-type-descriptions/qbs-bundle.json
View File

@@ -17,6 +17,7 @@
"qbs.Environment",
"qbs.File",
"qbs.FileInfo",
"qbs.Host",
"qbs.ModUtils",
"qbs.PathTools",
"qbs.PkgConfig",

6
src/libs/3rdparty/libptyqt/ptyqt.qbs vendored
View File

@@ -1,9 +1,6 @@
import qbs
Project {
QtcLibrary {
name: "ptyqt"
QtcLibrary {
Depends { name: "Qt.core" }
Depends { name: "Qt.network"; condition: qbs.targetOS.contains("windows") }
Depends { name: "winpty"; condition: qbs.targetOS.contains("windows") }
@@ -41,5 +38,4 @@ Project {
Depends { name: "winpty"; condition: qbs.targetOS.contains("windows") }
cpp.includePaths: base.concat(exportingProduct.sourceDirectory)
}
}
}

4
src/libs/3rdparty/libvterm/vterm.qbs vendored
View File

@@ -1,5 +1,4 @@
Project {
QtcLibrary {
QtcLibrary {
name: "vterm"
type: "staticlibrary"
@@ -30,5 +29,4 @@ Project {
Depends { name: "cpp" }
cpp.includePaths: base.concat("include")
}
}
}

6
src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs vendored
View File

@@ -1,7 +1,4 @@
import qbs 1.0
Project {
QtcLibrary {
QtcLibrary {
name: "yaml-cpp"
cpp.defines: base.concat(["YAML_CPP_DLL", "yaml_cpp_EXPORTS"])
@@ -102,5 +99,4 @@ Project {
cpp.includePaths: [exportingProduct.sourceDirectory + "/include/"]
cpp.defines: base.concat(["YAML_CPP_DLL"])
}
}
}

7
src/libs/aggregation/aggregation.qbs
View File

@@ -1,9 +1,5 @@
import qbs 1.0
Project {
QtcLibrary {
name: "Aggregation"
QtcLibrary {
Depends { name: "Qt.core" }
cpp.defines: base.concat("AGGREGATION_LIBRARY")
@@ -12,6 +8,5 @@ Project {
"aggregate.h",
"aggregation_global.h",
]
}
}

6
src/libs/cplusplus/cplusplus.qbs
View File

@@ -1,9 +1,6 @@
import qbs 1.0
Project {
QtcLibrary {
name: "CPlusPlus"
QtcLibrary {
cpp.includePaths: base.concat("../3rdparty")
cpp.defines: base.concat([
"NDEBUG",
@@ -131,5 +128,4 @@ Project {
exportingProduct.sourceDirectory + "/../3rdparty"
]
}
}
}

6
src/libs/extensionsystem/extensionsystem.qbs
View File

@@ -1,9 +1,6 @@
import qbs 1.0
Project {
QtcLibrary {
name: "ExtensionSystem"
QtcLibrary {
cpp.defines: base.concat([
"EXTENSIONSYSTEM_LIBRARY",
"IDE_TEST_DIR=\".\""
@@ -41,5 +38,4 @@ Project {
Export {
Depends { name: "Qt.core" }
}
}
}

6
src/libs/languageserverprotocol/languageserverprotocol.qbs
View File

@@ -1,9 +1,6 @@
import qbs 1.0
Project {
QtcLibrary {
name: "LanguageServerProtocol"
QtcLibrary {
Depends { name: "Utils" }
cpp.defines: base.concat("LANGUAGESERVERPROTOCOL_LIBRARY")
@@ -50,5 +47,4 @@ Project {
"workspace.cpp",
"workspace.h",
]
}
}

6
src/libs/languageutils/languageutils.qbs
View File

@@ -1,9 +1,6 @@
import qbs 1.0
Project {
QtcLibrary {
name: "LanguageUtils"
QtcLibrary {
cpp.defines: base.concat(["LANGUAGEUTILS_LIBRARY"])
cpp.optimization: "fast"
@@ -16,5 +13,4 @@ Project {
"fakemetaobject.h",
"languageutils_global.h",
]
}
}

6
src/libs/qmldebug/qmldebug.qbs
View File

@@ -1,9 +1,6 @@
import qbs 1.0
Project {
QtcLibrary {
name: "QmlDebug"
QtcLibrary {
cpp.defines: base.concat("QMLDEBUG_LIBRARY")
Depends { name: "Qt"; submodules: ["gui", "network"] }
@@ -36,5 +33,4 @@ Project {
"qpacketprotocol.cpp",
"qpacketprotocol.h",
]
}
}

6
src/libs/qmljs/qmljs.qbs
View File

@@ -1,9 +1,6 @@
import qbs 1.0
Project {
QtcLibrary {
name: "QmlJS"
QtcLibrary {
cpp.defines: base.concat(["QMLJS_LIBRARY"])
cpp.optimization: "fast"
@@ -79,5 +76,4 @@ Project {
Depends { name: "CPlusPlus" }
Depends { name: "LanguageUtils" }
}
}
}

8
src/libs/tracing/tracing.qbs
View File

@@ -1,11 +1,6 @@
import qbs 1.0
import QtcLibrary
Project {
QtcLibrary {
name: "Tracing"
QtcLibrary {
Depends { name: "Qt"; submodules: ["qml", "quick", "gui"] }
Depends { name: "Qt.testlib"; condition: project.withAutotests }
Depends { name: "Utils" }
@@ -48,5 +43,4 @@ Project {
}
cpp.defines: base.concat("TRACING_LIBRARY")
}
}

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

@@ -1,14 +1,9 @@
import qbs 1.0
import qbs.FileInfo
Project {
QtcLibrary {
name: "Utils"
QtcLibrary {
cpp.includePaths: base.concat("mimetypes2", ".")
cpp.defines: base.concat([
"UTILS_LIBRARY"
])
cpp.defines: base.concat(["UTILS_LIBRARY"])
cpp.dynamicLibraries: {
var libs = [];
if (qbs.targetOS.contains("windows")) {
@@ -477,5 +472,4 @@ Project {
Depends { name: "Tasking" }
cpp.includePaths: base.concat("mimetypes2")
}
}
}

6
src/plugins/android/android.qbs
View File

@@ -1,9 +1,6 @@
import qbs 1.0
Project {
QtcPlugin {
name: "Android"
QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
Depends { name: "Core" }
Depends { name: "Debugger" }
@@ -122,5 +119,4 @@ Project {
"sdkmanageroutputparser_test.h",
]
}
}
}

6
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -1,11 +1,8 @@
import qbs 1.0
import qbs.FileInfo
import qbs.Utilities
Project {
QtcPlugin {
name: "Core"
QtcPlugin {
Depends {
name: "Qt"
submodules: ["widgets", "xml", "network", "qml", "sql", "printsupport"]
@@ -379,5 +376,4 @@ Project {
Depends { name: "Aggregation" }
Depends { name: "Utils" }
}
}
}

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

@@ -1,14 +1,12 @@
import qbs 1.0
Project {
QtcPlugin {
name: "Debugger"
QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "network"] }
Depends { name: "Qt"; submodules: ["network", "widgets"] }
Depends { name: "Aggregation" }
Depends { name: "CPlusPlus" }
Depends { name: "QmlDebug" }
Depends { name: "LanguageUtils" }
Depends { name: "QmlDebug" }
Depends { name: "QmlJS" }
Depends { name: "Utils" }
@@ -18,18 +16,12 @@ Project {
Depends { name: "QtSupport" }
Depends { name: "TextEditor" }
pluginTestDepends: [
"QmakeProjectManager"
]
pluginRecommends: ["BinEditor"]
pluginTestDepends: ["QmakeProjectManager"]
cpp.includePaths: base.concat([project.sharedSourcesDir + "/registryaccess"])
cpp.enableExceptions: true
pluginRecommends: [
"CppEditor",
"BinEditor"
]
Group {
name: "General"
files: [
@@ -266,5 +258,4 @@ Project {
Export {
Depends { name: "CPlusPlus" }
}
}
}

8
src/plugins/help/help.qbs
View File

@@ -1,12 +1,9 @@
import qbs.Utilities
Project {
QtcPlugin {
name: "Help"
QtcPlugin {
name: "Help"
Depends { name: "Qt"; submodules: ["help", "network", "sql"]; }
Depends { name: "Qt"; submodules: ["help", "network", "sql"] }
Depends { name: "Qt.printsupport" }
Depends { name: "Qt.webenginewidgets"; required: false }
@@ -86,5 +83,4 @@ Project {
"topicchooser.cpp", "topicchooser.h",
]
}
}
}

6
src/plugins/projectexplorer/projectexplorer.qbs
View File

@@ -1,9 +1,6 @@
import qbs 1.0
Project {
QtcPlugin {
name: "ProjectExplorer"
QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "qml"] }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
@@ -257,5 +254,4 @@ Project {
Export {
Depends { name: "Qt.network" }
}
}
}

6
src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
View File

@@ -1,9 +1,6 @@
import qbs 1.0
Project {
QtcPlugin {
name: "QmakeProjectManager"
QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "network"] }
Depends { name: "QmlJS" }
Depends { name: "Utils" }
@@ -81,5 +78,4 @@ Project {
Export {
Depends { name: "QtSupport" }
}
}
}

6
src/plugins/qtsupport/qtsupport.qbs
View File

@@ -1,9 +1,6 @@
import qbs 1.0
Project {
QtcPlugin {
name: "QtSupport"
QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml"]; }
Depends { name: "Utils" }
@@ -118,5 +115,4 @@ Project {
"gettingstartedwelcomepage.h"
]
}
}
}

6
src/plugins/remotelinux/remotelinux.qbs
View File

@@ -1,9 +1,6 @@
import qbs 1.0
Project {
QtcPlugin {
name: "RemoteLinux"
QtcPlugin {
Depends { name: "Qt.widgets" }
Depends { name: "QmlDebug" }
Depends { name: "Utils" }
@@ -74,5 +71,4 @@ Project {
Depends { name: "Debugger" }
Depends { name: "Core" }
}
}
}

9
src/plugins/resourceeditor/resourceeditor.qbs
View File

@@ -1,15 +1,13 @@
import qbs 1.0
Project {
QtcPlugin {
name: "ResourceEditor"
QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml"] }
Depends { name: "Aggregation" }
Depends { name: "ProjectExplorer" }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
cpp.defines: base.concat(["RESOURCEEDITOR_LIBRARY"])
@@ -35,5 +33,4 @@ Project {
"undocommands.cpp", "undocommands_p.h",
]
}
}
}

5
src/plugins/texteditor/texteditor.qbs
View File

@@ -1,11 +1,9 @@
import qbs 1.0
import qbs.FileInfo
import qbs.Environment
Project {
QtcPlugin {
name: "TextEditor"
QtcPlugin {
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "printsupport"] }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
@@ -233,5 +231,4 @@ Project {
"texteditor_test.cpp",
]
}
}
}