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

Fix qbs build

Browse Source 
Amends 88781a003f.

Change-Id: I5b44d89cc1b536d0d533cd29fc3a06005a7c80d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2022-04-29 11:17:54 +02:00
parent 88781a003f
commit 2e725b4869
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qbs/modules/sqlite_sources/sqlite-sources.qbs
View File

@@ -11,9 +11,9 @@ Module {
cpp.defines: { cpp.defines: {
var defines = ["SQLITE_CUSTOM_INCLUDE=config.h", "SQLITE_CORE"]; var defines = ["SQLITE_CUSTOM_INCLUDE=config.h", "SQLITE_CORE"];
if (buildSharedLib) if (buildSharedLib)
defines.push("BUILD_SQLITE_LIBRARY"); defines.push("SQLITE_LIBRARY");
else else
defines.push("BUILD_SQLITE_STATIC_LIBRARY"); defines.push("SQLITE_STATIC_LIBRARY");
if (qbs.targetOS.contains("linux")) if (qbs.targetOS.contains("linux"))
defines.push("_POSIX_C_SOURCE=200809L", "_GNU_SOURCE"); defines.push("_POSIX_C_SOURCE=200809L", "_GNU_SOURCE");
else if (qbs.targetOS.contains("macos")) else if (qbs.targetOS.contains("macos"))

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

@@ -7,7 +7,7 @@ QtcLibrary {
Depends { name: "Qt.network" } Depends { name: "Qt.network" }
Depends { name: "Utils" } Depends { name: "Utils" }
cpp.defines: base.concat("CLANGSUPPORT_BUILD_LIB") cpp.defines: base.concat("CLANGSUPPORT_LIBRARY")
cpp.includePaths: base.concat(".") cpp.includePaths: base.concat(".")
Group { Group {

2
src/plugins/qmldesigner/qmldesignerplugin.qbs
View File

@@ -29,7 +29,7 @@ Project {
Depends { name: "Sqlite" } Depends { name: "Sqlite" }
cpp.defines: base.concat([ cpp.defines: base.concat([
"DESIGNER_CORE_LIBRARY", "QMLDESIGNER_LIBRARY",
"TIMELINE_QML_PATH=\"" + FileInfo.joinPaths(path, "components", "TIMELINE_QML_PATH=\"" + FileInfo.joinPaths(path, "components",
"timelineeditor", "qml") + "\"" "timelineeditor", "qml") + "\""
]) ])

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

@@ -11,7 +11,7 @@ Project {
Depends { name: "Core" } Depends { name: "Core" }
cpp.defines: base.concat(["RESOURCE_LIBRARY"]) cpp.defines: base.concat(["RESOURCEEDITOR_LIBRARY"])
Group { Group {
name: "General" name: "General"

2
src/tools/processlauncher/processlauncher.qbs
View File

@@ -6,7 +6,7 @@ QtcTool {
Depends { name: "Qt.network" } Depends { name: "Qt.network" }
cpp.defines: base.concat("QTCREATOR_UTILS_STATIC_LIB") cpp.defines: base.concat("UTILS_STATIC_LIBRARY")
cpp.includePaths: base.concat(pathToUtils) cpp.includePaths: base.concat(pathToUtils)
Properties { Properties {

2
tests/unit/unittest/unittest.qbs
View File

@@ -40,7 +40,7 @@ Project {
"QT_RESTRICTED_CAST_FROM_ASCII", "QT_RESTRICTED_CAST_FROM_ASCII",
"QT_USE_FAST_OPERATOR_PLUS", "QT_USE_FAST_OPERATOR_PLUS",
"QT_USE_FAST_CONCATENATION", "QT_USE_FAST_CONCATENATION",
"CLANGSUPPORT_BUILD_STATIC_LIB", "CLANGSUPPORT_STATIC_LIBRARY",
"CLANGTOOLS_STATIC_LIBRARY", "CLANGTOOLS_STATIC_LIBRARY",
"CPPEDITOR_STATIC_LIBRARY", "CPPEDITOR_STATIC_LIBRARY",
"DEBUGGER_STATIC_LIBRARY", "DEBUGGER_STATIC_LIBRARY",