summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-06-25 18:17:15 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2013-06-26 16:46:18 +0200
commit5a3c4cc8effbdfd581744bc41216caa6142bc886 (patch)
treee1827a78db81b857ce22a3c30c1ec8733fdd11b9 /src/app
parentee70e9d2673ab9ae95a3f42985615be52f4e1a07 (diff)
downloadqt-creator-5a3c4cc8effbdfd581744bc41216caa6142bc886.tar.gz
qbs files: fix OS X checks
Change-Id: I618c1ad4bf328492403b48c8e398abd538f74787 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/app')
-rw-r--r--src/app/app.qbs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/app/app.qbs b/src/app/app.qbs
index c92d864d9f..824999c116 100644
--- a/src/app/app.qbs
+++ b/src/app/app.qbs
@@ -5,7 +5,7 @@ Application {
name: project.ide_app_target
consoleApplication: qbs.debugInformation
- cpp.rpaths: qbs.targetOS.contains("mac") ? ["@executable_path/.."]
+ cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/.."]
: ["$ORIGIN/../lib/qtcreator"]
cpp.defines: Defaults.defines(qbs)
cpp.linkerFlags: {
@@ -40,7 +40,7 @@ Application {
Group {
name: "qtcreator.sh"
- condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("mac")
+ condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
files: "../../bin/qtcreator.sh"
qbs.install: true
qbs.installDir: "bin"