diff --git a/qbs/modules/sqlite_sources/sqlite-sources.qbs b/qbs/modules/sqlite_sources/sqlite-sources.qbs index 392b7c08248..323057754fb 100644 --- a/qbs/modules/sqlite_sources/sqlite-sources.qbs +++ b/qbs/modules/sqlite_sources/sqlite-sources.qbs @@ -11,9 +11,9 @@ Module { cpp.defines: { var defines = ["SQLITE_CUSTOM_INCLUDE=config.h", "SQLITE_CORE"]; if (buildSharedLib) - defines.push("BUILD_SQLITE_LIBRARY"); + defines.push("SQLITE_LIBRARY"); else - defines.push("BUILD_SQLITE_STATIC_LIBRARY"); + defines.push("SQLITE_STATIC_LIBRARY"); if (qbs.targetOS.contains("linux")) defines.push("_POSIX_C_SOURCE=200809L", "_GNU_SOURCE"); else if (qbs.targetOS.contains("macos")) diff --git a/src/libs/clangsupport/clangsupport.qbs b/src/libs/clangsupport/clangsupport.qbs index f2ca80ce551..17697fa8229 100644 --- a/src/libs/clangsupport/clangsupport.qbs +++ b/src/libs/clangsupport/clangsupport.qbs @@ -7,7 +7,7 @@ QtcLibrary { Depends { name: "Qt.network" } Depends { name: "Utils" } - cpp.defines: base.concat("CLANGSUPPORT_BUILD_LIB") + cpp.defines: base.concat("CLANGSUPPORT_LIBRARY") cpp.includePaths: base.concat(".") Group { diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs index a0427d37809..6332b6a9993 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.qbs +++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs @@ -29,7 +29,7 @@ Project { Depends { name: "Sqlite" } cpp.defines: base.concat([ - "DESIGNER_CORE_LIBRARY", + "QMLDESIGNER_LIBRARY", "TIMELINE_QML_PATH=\"" + FileInfo.joinPaths(path, "components", "timelineeditor", "qml") + "\"" ]) diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs index 5cf943becf2..71a99ccb67b 100644 --- a/src/plugins/resourceeditor/resourceeditor.qbs +++ b/src/plugins/resourceeditor/resourceeditor.qbs @@ -11,7 +11,7 @@ Project { Depends { name: "Core" } - cpp.defines: base.concat(["RESOURCE_LIBRARY"]) + cpp.defines: base.concat(["RESOURCEEDITOR_LIBRARY"]) Group { name: "General" diff --git a/src/tools/processlauncher/processlauncher.qbs b/src/tools/processlauncher/processlauncher.qbs index 2b00bf89718..d52add65583 100644 --- a/src/tools/processlauncher/processlauncher.qbs +++ b/src/tools/processlauncher/processlauncher.qbs @@ -6,7 +6,7 @@ QtcTool { Depends { name: "Qt.network" } - cpp.defines: base.concat("QTCREATOR_UTILS_STATIC_LIB") + cpp.defines: base.concat("UTILS_STATIC_LIBRARY") cpp.includePaths: base.concat(pathToUtils) Properties { diff --git a/tests/unit/unittest/unittest.qbs b/tests/unit/unittest/unittest.qbs index 5401aa09e1b..a2fe44ec43b 100644 --- a/tests/unit/unittest/unittest.qbs +++ b/tests/unit/unittest/unittest.qbs @@ -40,7 +40,7 @@ Project { "QT_RESTRICTED_CAST_FROM_ASCII", "QT_USE_FAST_OPERATOR_PLUS", "QT_USE_FAST_CONCATENATION", - "CLANGSUPPORT_BUILD_STATIC_LIB", + "CLANGSUPPORT_STATIC_LIBRARY", "CLANGTOOLS_STATIC_LIBRARY", "CPPEDITOR_STATIC_LIBRARY", "DEBUGGER_STATIC_LIBRARY",