forked from qt-creator/qt-creator
qbs build: Derive QtCreator app from QtcProduct.
So we inherit e.g. the cpp flags defined there. (Currently, compilation fails because cxxLanguageVersion is not set for this product.) Change-Id: Id66f2f6cdc7ba2155c820fd9aa77bb6ea9ecf0b7 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
This commit is contained in:
@@ -1,23 +1,18 @@
|
|||||||
import qbs
|
import qbs
|
||||||
|
|
||||||
Application {
|
QtcProduct {
|
||||||
|
type: ["application"]
|
||||||
name: project.ide_app_target
|
name: project.ide_app_target
|
||||||
consoleApplication: qbs.debugInformation
|
consoleApplication: qbs.debugInformation
|
||||||
|
|
||||||
cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/.."]
|
cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/.."]
|
||||||
: ["$ORIGIN/../" + project.libDirName + "/qtcreator"]
|
: ["$ORIGIN/../" + project.libDirName + "/qtcreator"]
|
||||||
cpp.defines: project.generalDefines
|
|
||||||
cpp.linkerFlags: {
|
|
||||||
if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw")))
|
|
||||||
return ["-Wl,-s"]
|
|
||||||
}
|
|
||||||
cpp.includePaths: [
|
cpp.includePaths: [
|
||||||
"../shared/qtsingleapplication",
|
"../shared/qtsingleapplication",
|
||||||
"../shared/qtlockedfile",
|
"../shared/qtlockedfile",
|
||||||
]
|
]
|
||||||
|
|
||||||
Depends { name: "app_version_header" }
|
Depends { name: "app_version_header" }
|
||||||
Depends { name: "cpp" }
|
|
||||||
Depends { name: "Qt"; submodules: ["widgets", "network"] }
|
Depends { name: "Qt"; submodules: ["widgets", "network"] }
|
||||||
Depends { name: "Utils" }
|
Depends { name: "Utils" }
|
||||||
Depends { name: "ExtensionSystem" }
|
Depends { name: "ExtensionSystem" }
|
||||||
|
Reference in New Issue
Block a user