diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-18 13:49:05 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-18 14:16:53 +0100 |
| commit | 1ffe15a471fa763f55d45c95cf833819860e1a74 (patch) | |
| tree | d430e8961b0346b665f6f6430e5ebae1aa144d55 /qtcreator.qbs | |
| parent | e46a63b93ecea24c25a8e62ba6247cec8e148a14 (diff) | |
| parent | 80263a5221573e8a6f1cc5c1aa74eb184c90ed67 (diff) | |
| download | qt-creator-1ffe15a471fa763f55d45c95cf833819860e1a74.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
Diffstat (limited to 'qtcreator.qbs')
| -rw-r--r-- | qtcreator.qbs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index 159c1b52d5..c851330ddd 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -161,6 +161,7 @@ Project { Depends { name: "Qt"; submodules: ["widgets", "network"] } Depends { name: "Utils" } Depends { name: "ExtensionSystem" } + Depends { name: "Core" } files: [ "src/app/main.cpp", @@ -175,14 +176,14 @@ Project { ] Group { - condition: qbs.targetOS == "linux" || qbs.targetOS == "macx" + condition: qbs.targetPlatform.indexOf("unix") != -1 files: "bin/qtcreator.sh" qbs.install: true qbs.installDir: "bin" } Group { - condition: qbs.targetOS == "linux" || qbs.targetOS == "macx" + condition: qbs.targetPlatform.indexOf("unix") != -1 files: [ "src/shared/qtlockedfile/qtlockedfile_unix.cpp" ] |