summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2015-01-29 17:04:27 +0100
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2015-01-29 16:11:58 +0000
commit6feaa8b3735495d7d1805fac6d75e29c78248963 (patch)
treed2eaca2449f71121d35eb32f3132b12c092e8bd1
parent20454b895ff8d4bf395da3d4408762679467f340 (diff)
downloadqt-creator-6feaa8b3735495d7d1805fac6d75e29c78248963.tar.gz
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>
-rw-r--r--src/app/app.qbs9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/app/app.qbs b/src/app/app.qbs
index 844536ab13..d02e79aac8 100644
--- a/src/app/app.qbs
+++ b/src/app/app.qbs
@@ -1,23 +1,18 @@
import qbs
-Application {
+QtcProduct {
+ type: ["application"]
name: project.ide_app_target
consoleApplication: qbs.debugInformation
cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/.."]
: ["$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: [
"../shared/qtsingleapplication",
"../shared/qtlockedfile",
]
Depends { name: "app_version_header" }
- Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "network"] }
Depends { name: "Utils" }
Depends { name: "ExtensionSystem" }