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

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

@@ -1,56 +1,53 @@
import qbs
Project {
references: "settings/qmldesignersettings.qbs"
QtcPlugin {
name: "QmlDesignerBase"
QtcPlugin {
name: "QmlDesignerBase"
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QmlDesignerSettings" }
Depends { name: "QtSupport" }
Depends { name: "Qt.quickwidgets" }
Depends { name: "Qt.gui-private" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" }
Depends { name: "Qt.quickwidgets" }
Depends { name: "Qt.gui-private" }
cpp.includePaths: ["settings", "studio", "utils"]
cpp.includePaths: ["settings", "studio", "utils"]
files: [
"qmldesignerbase_global.h",
"qmldesignerbaseplugin.cpp",
"qmldesignerbaseplugin.h",
]
Group {
prefix: "studio/"
files: [
"studioquickutils.cpp",
"studioquickutils.h",
"studioquickwidget.cpp",
"studioquickwidget.h",
"studiosettingspage.cpp",
"studiosettingspage.h",
"studiostyle.cpp",
"studiostyle.h",
"studiostyle_p.cpp",
"studiostyle_p.h",
"studiovalidator.cpp",
"studiovalidator.h",
]
}
Group {
prefix: "utils/"
files: [
"designerpaths.cpp",
"designerpaths.h",
"qmlpuppetpaths.cpp",
"qmlpuppetpaths.h",
"windowmanager.cpp",
"windowmanager.h",
"qmldesignerbase_global.h",
"qmldesignerbaseplugin.cpp",
"qmldesignerbaseplugin.h",
]
Group {
prefix: "settings/"
prefix: "studio/"
files: [
"designersettings.cpp",
"designersettings.h",
"qmldesignersettings_global.h",
"studioquickutils.cpp",
"studioquickutils.h",
"studioquickwidget.cpp",
"studioquickwidget.h",
"studiosettingspage.cpp",
"studiosettingspage.h",
"studiostyle.cpp",
"studiostyle.h",
"studiostyle_p.cpp",
"studiostyle_p.h",
"studiovalidator.cpp",
"studiovalidator.h",
]
}
Group {
prefix: "utils/"
files: [
"designerpaths.cpp",
"designerpaths.h",
"qmlpuppetpaths.cpp",
"qmlpuppetpaths.h",
"windowmanager.cpp",
"windowmanager.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")
}
}

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

@@ -1,239 +1,242 @@
import qbs.FileInfo
import qbs.Environment
QtcPlugin {
name: "TextEditor"
Project {
references: "texteditorsupport.qbs"
QtcPlugin {
name: "TextEditor"
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "printsupport"] }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Depends { name: "KSyntaxHighlighting" }
Export {
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "printsupport"] }
Depends { name: "Aggregation" }
Depends { name: "TextEditorSupport" }
Depends { name: "Utils" }
Depends { name: "KSyntaxHighlighting" }
}
Depends { name: "Core" }
Export {
Depends { name: "KSyntaxHighlighting" }
Depends { name: "TextEditorSupport" }
}
cpp.enableExceptions: true
Depends { name: "Core" }
files: [
"autocompleter.cpp",
"autocompleter.h",
"basefilefind.cpp",
"basefilefind.h",
"basehoverhandler.cpp",
"basehoverhandler.h",
"behaviorsettings.cpp",
"behaviorsettings.h",
"behaviorsettingspage.cpp",
"behaviorsettingspage.h",
"behaviorsettingswidget.cpp",
"behaviorsettingswidget.h",
"blockrange.h",
"bookmark.cpp",
"bookmark.h",
"bookmarkfilter.cpp",
"bookmarkfilter.h",
"bookmarkmanager.cpp",
"bookmarkmanager.h",
"circularclipboard.cpp",
"circularclipboard.h",
"circularclipboardassist.cpp",
"circularclipboardassist.h",
"codecchooser.cpp",
"codecchooser.h",
"codestyleeditor.cpp",
"codestyleeditor.h",
"codestylepool.cpp",
"codestylepool.h",
"codestyleselectorwidget.cpp",
"codestyleselectorwidget.h",
"colorpreviewhoverhandler.cpp",
"colorpreviewhoverhandler.h",
"colorscheme.cpp",
"colorscheme.h",
"colorschemeedit.cpp",
"colorschemeedit.h",
"command.cpp",
"command.h",
"commentssettings.cpp",
"commentssettings.h",
"completionsettings.cpp",
"completionsettings.h",
"completionsettingspage.cpp",
"completionsettingspage.h",
"displaysettings.cpp",
"displaysettings.h",
"displaysettingspage.cpp",
"displaysettingspage.h",
"extraencodingsettings.cpp",
"extraencodingsettings.h",
"findincurrentfile.cpp",
"findincurrentfile.h",
"findinfiles.cpp",
"findinfiles.h",
"findinopenfiles.cpp",
"findinopenfiles.h",
"fontsettings.cpp",
"fontsettings.h",
"fontsettingspage.cpp",
"fontsettingspage.h",
"formatter.h",
"formattexteditor.cpp",
"formattexteditor.h",
"highlighter.cpp",
"highlighter.h",
"highlighterhelper.cpp",
"highlighterhelper.h",
"highlightersettings.cpp",
"highlightersettings.h",
"highlightersettingspage.cpp",
"highlightersettingspage.h",
"icodestylepreferences.cpp",
"icodestylepreferences.h",
"icodestylepreferencesfactory.cpp",
"icodestylepreferencesfactory.h",
"indenter.h",
"ioutlinewidget.h",
"jsoneditor.cpp",
"jsoneditor.h",
"linenumberfilter.cpp",
"linenumberfilter.h",
"marginsettings.cpp",
"marginsettings.h",
"markdowneditor.cpp",
"markdowneditor.h",
"outlinefactory.cpp",
"outlinefactory.h",
"plaintexteditorfactory.cpp",
"plaintexteditorfactory.h",
"quickfix.cpp",
"quickfix.h",
"refactoringchanges.cpp",
"refactoringchanges.h",
"refactoroverlay.cpp",
"refactoroverlay.h",
"semantichighlighter.cpp",
"semantichighlighter.h",
"simplecodestylepreferences.cpp",
"simplecodestylepreferences.h",
"simplecodestylepreferenceswidget.cpp",
"simplecodestylepreferenceswidget.h",
"storagesettings.cpp",
"storagesettings.h",
"syntaxhighlighter.cpp",
"syntaxhighlighter.h",
"tabsettings.cpp",
"tabsettings.h",
"tabsettingswidget.cpp",
"tabsettingswidget.h",
"textdocument.cpp",
"textdocument.h",
"textdocumentlayout.cpp",
"textdocumentlayout.h",
"texteditor.cpp",
"texteditor.h",
"texteditor.qrc",
"texteditor_global.h",
"texteditorconstants.cpp",
"texteditorconstants.h",
"texteditoroverlay.cpp",
"texteditoroverlay.h",
"texteditorplugin.cpp",
"texteditorsettings.cpp",
"texteditorsettings.h",
"texteditortr.h",
"textsuggestion.cpp",
"textsuggestion.h",
"textindenter.cpp",
"textindenter.h",
"textmark.cpp",
"textmark.h",
"textstyles.h",
"typehierarchy.cpp",
"typehierarchy.h",
"typingsettings.cpp",
"typingsettings.h",
]
cpp.enableExceptions: true
Group {
name: "CodeAssist"
prefix: "codeassist/"
files: [
"assistenums.h",
"assistinterface.cpp",
"assistinterface.h",
"assistproposalitem.cpp",
"assistproposalitem.h",
"assistproposaliteminterface.h",
"asyncprocessor.cpp",
"asyncprocessor.h",
"codeassistant.cpp",
"codeassistant.h",
"completionassistprovider.cpp",
"completionassistprovider.h",
"documentcontentcompletion.cpp",
"documentcontentcompletion.h",
"functionhintproposal.cpp",
"functionhintproposal.h",
"functionhintproposalwidget.cpp",
"functionhintproposalwidget.h",
"genericproposal.cpp",
"genericproposal.h",
"genericproposalmodel.cpp",
"genericproposalmodel.h",
"genericproposalwidget.cpp",
"genericproposalwidget.h",
"iassistprocessor.cpp",
"iassistprocessor.h",
"iassistproposal.cpp",
"iassistproposal.h",
"iassistproposalmodel.cpp",
"iassistproposalmodel.h",
"iassistproposalwidget.cpp",
"iassistproposalwidget.h",
"iassistprovider.cpp",
"iassistprovider.h",
"ifunctionhintproposalmodel.cpp",
"ifunctionhintproposalmodel.h",
"keywordscompletionassist.cpp",
"keywordscompletionassist.h",
"autocompleter.cpp",
"autocompleter.h",
"basefilefind.cpp",
"basefilefind.h",
"basehoverhandler.cpp",
"basehoverhandler.h",
"behaviorsettings.cpp",
"behaviorsettings.h",
"behaviorsettingspage.cpp",
"behaviorsettingspage.h",
"behaviorsettingswidget.cpp",
"behaviorsettingswidget.h",
"blockrange.h",
"bookmark.cpp",
"bookmark.h",
"bookmarkfilter.cpp",
"bookmarkfilter.h",
"bookmarkmanager.cpp",
"bookmarkmanager.h",
"circularclipboard.cpp",
"circularclipboard.h",
"circularclipboardassist.cpp",
"circularclipboardassist.h",
"codecchooser.cpp",
"codecchooser.h",
"codestyleeditor.cpp",
"codestyleeditor.h",
"codestylepool.cpp",
"codestylepool.h",
"codestyleselectorwidget.cpp",
"codestyleselectorwidget.h",
"colorpreviewhoverhandler.cpp",
"colorpreviewhoverhandler.h",
"colorscheme.cpp",
"colorscheme.h",
"colorschemeedit.cpp",
"colorschemeedit.h",
"command.cpp",
"command.h",
"commentssettings.cpp",
"commentssettings.h",
"completionsettings.cpp",
"completionsettings.h",
"completionsettingspage.cpp",
"completionsettingspage.h",
"displaysettings.cpp",
"displaysettings.h",
"displaysettingspage.cpp",
"displaysettingspage.h",
"extraencodingsettings.cpp",
"extraencodingsettings.h",
"findincurrentfile.cpp",
"findincurrentfile.h",
"findinfiles.cpp",
"findinfiles.h",
"findinopenfiles.cpp",
"findinopenfiles.h",
"fontsettings.cpp",
"fontsettings.h",
"fontsettingspage.cpp",
"fontsettingspage.h",
"formatter.h",
"formattexteditor.cpp",
"formattexteditor.h",
"highlighter.cpp",
"highlighter.h",
"highlighterhelper.cpp",
"highlighterhelper.h",
"highlightersettings.cpp",
"highlightersettings.h",
"highlightersettingspage.cpp",
"highlightersettingspage.h",
"icodestylepreferences.cpp",
"icodestylepreferences.h",
"icodestylepreferencesfactory.cpp",
"icodestylepreferencesfactory.h",
"indenter.h",
"ioutlinewidget.h",
"jsoneditor.cpp",
"jsoneditor.h",
"linenumberfilter.cpp",
"linenumberfilter.h",
"marginsettings.cpp",
"marginsettings.h",
"markdowneditor.cpp",
"markdowneditor.h",
"outlinefactory.cpp",
"outlinefactory.h",
"plaintexteditorfactory.cpp",
"plaintexteditorfactory.h",
"quickfix.cpp",
"quickfix.h",
"refactoringchanges.cpp",
"refactoringchanges.h",
"refactoroverlay.cpp",
"refactoroverlay.h",
"semantichighlighter.cpp",
"semantichighlighter.h",
"simplecodestylepreferences.cpp",
"simplecodestylepreferences.h",
"simplecodestylepreferenceswidget.cpp",
"simplecodestylepreferenceswidget.h",
"storagesettings.cpp",
"storagesettings.h",
"syntaxhighlighter.cpp",
"syntaxhighlighter.h",
"tabsettingswidget.cpp",
"tabsettingswidget.h",
"textdocument.cpp",
"textdocument.h",
"textdocumentlayout.cpp",
"textdocumentlayout.h",
"texteditor.cpp",
"texteditor.h",
"texteditor.qrc",
"texteditor_global.h",
"texteditorconstants.cpp",
"texteditorconstants.h",
"texteditoroverlay.cpp",
"texteditoroverlay.h",
"texteditorplugin.cpp",
"texteditorsettings.cpp",
"texteditorsettings.h",
"texteditortr.h",
"textsuggestion.cpp",
"textsuggestion.h",
"textindenter.cpp",
"textindenter.h",
"textmark.cpp",
"textmark.h",
"textstyles.h",
"typehierarchy.cpp",
"typehierarchy.h",
"typingsettings.cpp",
"typingsettings.h",
]
}
Group {
name: "Snippets"
prefix: "snippets/"
files: [
"reuse.h",
"snippet.cpp",
"snippet.h",
"snippetassistcollector.cpp",
"snippetassistcollector.h",
"snippeteditor.cpp",
"snippeteditor.h",
"snippetoverlay.cpp",
"snippetoverlay.h",
"snippetparser.cpp",
"snippetparser.h",
"snippetprovider.cpp",
"snippetprovider.h",
"snippetscollection.cpp",
"snippetscollection.h",
"snippetssettingspage.cpp",
"snippetssettingspage.h",
]
}
Group {
name: "CodeAssist"
prefix: "codeassist/"
files: [
"assistenums.h",
"assistinterface.cpp",
"assistinterface.h",
"assistproposalitem.cpp",
"assistproposalitem.h",
"assistproposaliteminterface.h",
"asyncprocessor.cpp",
"asyncprocessor.h",
"codeassistant.cpp",
"codeassistant.h",
"completionassistprovider.cpp",
"completionassistprovider.h",
"documentcontentcompletion.cpp",
"documentcontentcompletion.h",
"functionhintproposal.cpp",
"functionhintproposal.h",
"functionhintproposalwidget.cpp",
"functionhintproposalwidget.h",
"genericproposal.cpp",
"genericproposal.h",
"genericproposalmodel.cpp",
"genericproposalmodel.h",
"genericproposalwidget.cpp",
"genericproposalwidget.h",
"iassistprocessor.cpp",
"iassistprocessor.h",
"iassistproposal.cpp",
"iassistproposal.h",
"iassistproposalmodel.cpp",
"iassistproposalmodel.h",
"iassistproposalwidget.cpp",
"iassistproposalwidget.h",
"iassistprovider.cpp",
"iassistprovider.h",
"ifunctionhintproposalmodel.cpp",
"ifunctionhintproposalmodel.h",
"keywordscompletionassist.cpp",
"keywordscompletionassist.h",
]
}
QtcTestFiles {
files: [
"codeassist/codeassist_test.cpp",
"codeassist/codeassist_test.h",
"highlighter_test.cpp",
"highlighter_test.h",
"texteditor_test.cpp",
"texteditor_test.h",
]
Group {
name: "Snippets"
prefix: "snippets/"
files: [
"reuse.h",
"snippet.cpp",
"snippet.h",
"snippetassistcollector.cpp",
"snippetassistcollector.h",
"snippeteditor.cpp",
"snippeteditor.h",
"snippetoverlay.cpp",
"snippetoverlay.h",
"snippetparser.cpp",
"snippetparser.h",
"snippetprovider.cpp",
"snippetprovider.h",
"snippetscollection.cpp",
"snippetscollection.h",
"snippetssettingspage.cpp",
"snippetssettingspage.h",
]
}
QtcTestFiles {
files: [
"codeassist/codeassist_test.cpp",
"codeassist/codeassist_test.h",
"highlighter_test.cpp",
"highlighter_test.h",
"texteditor_test.cpp",
"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"]
}
}