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

Fix qbs build on Windows

Browse Source 
Change-Id: Ibbc13ca80fbfbb1d8293d8e78b57dab43cbb92b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Stenger
2024-09-27 07:46:50 +02:00
parent fde92a97c1
commit 6a59aa7233
4 changed files with 308 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,11 @@
import qbs
QtcPlugin {
Project {
references: "settings/qmldesignersettings.qbs"
QtcPlugin {
name: "QmlDesignerBase"
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QmlDesignerSettings" }
Depends { name: "QtSupport" }
Depends { name: "Qt.quickwidgets" }
Depends { name: "Qt.gui-private" }
@@ -44,13 +45,9 @@ QtcPlugin {
"windowmanager.cpp",
"windowmanager.h",
]
Group {
prefix: "settings/"
files: [
"designersettings.cpp",
"designersettings.h",
"qmldesignersettings_global.h",
]
}
Export {
Depends { name: "QmlDesignerSettings" }
}
}
}

19
src/plugins/qmldesignerbase/settings/qmldesignersettings.qbs Normal file
View File

@@ -0,0 +1,19 @@
QtcLibrary {
name: "QmlDesignerSettings"
type: "staticlibrary"
Depends { name: "Utils" }
cpp.defines: base.concat("QMLDESIGNERSETTINGS_STATIC_LIBRARY")
files: [
"qmldesignersettings_global.h",
"designersettings.cpp",
"designersettings.h",
]
Export {
Depends { name: "cpp" }
cpp.defines: base.concat("QMLDESIGNERSETTINGS_STATIC_LIBRARY")
}
}

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

@@ -1,16 +1,20 @@
import qbs.FileInfo
import qbs.Environment
QtcPlugin {
Project {
references: "texteditorsupport.qbs"
QtcPlugin {
name: "TextEditor"
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "printsupport"] }
Depends { name: "Aggregation" }
Depends { name: "TextEditorSupport" }
Depends { name: "Utils" }
Depends { name: "KSyntaxHighlighting" }
Export {
Depends { name: "KSyntaxHighlighting" }
Depends { name: "TextEditorSupport" }
}
Depends { name: "Core" }
@@ -124,8 +128,6 @@ QtcPlugin {
"storagesettings.h",
"syntaxhighlighter.cpp",
"syntaxhighlighter.h",
"tabsettings.cpp",
"tabsettings.h",
"tabsettingswidget.cpp",
"tabsettingswidget.h",
"textdocument.cpp",
@@ -236,4 +238,5 @@ QtcPlugin {
"texteditor_test.h",
]
}
}
}

20
src/plugins/texteditor/texteditorsupport.qbs Normal file
View File

@@ -0,0 +1,20 @@
QtcLibrary {
name: "TextEditorSupport"
type: "staticlibrary"
Depends { name: "Utils" }
cpp.defines: base.concat("TEXTEDITORSUPPORT_STATIC_LIBRARY")
files: [
"tabsettings.cpp",
"tabsettings.h",
"texteditorsupport_global.h",
]
Export {
Depends { name: "cpp" }
cpp.includePaths: exportingProduct.sourceDirectory
cpp.defines: ["TEXTEDITORSUPPORT_STATIC_LIBRARY"]
}
}