diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-28 12:02:40 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-28 12:02:40 +0100 |
commit | 6bbdeec8127cc968245eab34c2cd1ac42e053bde (patch) | |
tree | 141e9a34e8fdce4116c32a6bfb0a2b3b7510ee75 /qtcreator.qbs | |
parent | e84647aef4f49f35daf44c393499f1b5f0f5dba0 (diff) | |
parent | fac11973af407802edd8c44264b6e641d2aa21cf (diff) | |
download | qt-creator-6bbdeec8127cc968245eab34c2cd1ac42e053bde.tar.gz |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/qnx/blackberrydeployconfiguration.cpp
Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
Diffstat (limited to 'qtcreator.qbs')
-rw-r--r-- | qtcreator.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index c851330ddd..4648db53f1 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -45,6 +45,7 @@ Project { "src/plugins/debugger/debugger.qbs", "src/plugins/debugger/ptracepreload.qbs", "src/plugins/designer/designer.qbs", + "src/plugins/diffeditor/diffeditor.qbs", "src/plugins/fakevim/fakevim.qbs", "src/plugins/find/find.qbs", "src/plugins/genericprojectmanager/genericprojectmanager.qbs", @@ -109,7 +110,7 @@ Project { cmd.ide_version_major = product.ide_version_major; cmd.ide_version_minor = product.ide_version_minor; cmd.ide_version_release = product.ide_version_release; - cmd.onWindows = (product.modules.qbs.targetOS == "windows"); + cmd.onWindows = (product.moduleProperty("qbs", "targetOS") === "windows"); cmd.sourceCode = function() { var file = new TextFile(input.fileName); var content = file.readAll(); |