summaryrefslogtreecommitdiff
path: root/qtcreator.qbs
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2013-06-14 16:21:04 +0200
committerEike Ziller <eike.ziller@digia.com>2013-06-14 16:21:04 +0200
commitafe1d5ee654c55d720545131d408d6baf24829cb (patch)
tree20814e3458e6675e5be0ea8f513b788f58c570f3 /qtcreator.qbs
parent5ee8650eb4711e6a290667f6eb2b5a4c53a41945 (diff)
parent42c9c96361f113004fa0af23cfb2164b135f174d (diff)
downloadqt-creator-afe1d5ee654c55d720545131d408d6baf24829cb.tar.gz
Merge remote-tracking branch 'origin/2.8'
Conflicts: src/plugins/coreplugin/documentmanager.cpp Change-Id: I6dc025bc0f31eb694c8d9e2dd4ea5cc888ee8a94
Diffstat (limited to 'qtcreator.qbs')
-rw-r--r--qtcreator.qbs19
1 files changed, 11 insertions, 8 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 3f532f2e99..16c1558ffc 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -204,6 +204,7 @@ Project {
]
Group {
+ name: "qtcreator.sh"
condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
files: "bin/qtcreator.sh"
qbs.install: true
@@ -211,17 +212,19 @@ Project {
}
Group {
- condition: qbs.targetPlatform.indexOf("unix") != -1
- files: [
- "src/shared/qtlockedfile/qtlockedfile_unix.cpp"
- ]
+ name: "QtLockedFile_unix"
+ condition: qbs.targetPlatform.indexOf("unix") != -1
+ files: [
+ "src/shared/qtlockedfile/qtlockedfile_unix.cpp"
+ ]
}
Group {
- condition: qbs.targetOS == "windows"
- files: [
- "src/shared/qtlockedfile/qtlockedfile_win.cpp"
- ]
+ name: "QtLockedFile_win"
+ condition: qbs.targetOS == "windows"
+ files: [
+ "src/shared/qtlockedfile/qtlockedfile_win.cpp"
+ ]
}
Group {