diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-05-02 10:00:20 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-05-02 10:00:20 +0200 |
| commit | 0fb641c90e64054a28a39e3f48d96f953399805a (patch) | |
| tree | 504f097db01334a87316f8e825f1db0cba6bfba1 /qtcreator.qbs | |
| parent | f4520bafaccb0832266f8d88f254e910ed7a23f4 (diff) | |
| parent | 4b2cc015f867941a7ae35a38d81ec9daa5616711 (diff) | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
Diffstat (limited to 'qtcreator.qbs')
| -rw-r--r-- | qtcreator.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index 6374b3f6a8..7cd9ca116b 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -45,7 +45,7 @@ Project { property string ide_bin_path: qbs.targetOS.contains("osx") ? ide_app_target + ".app/Contents/MacOS" : ide_app_path - property bool testsEnabled: qbs.getenv("TEST") || qbs.buildVariant === "debug" + property bool testsEnabled: qbs.getEnv("TEST") || qbs.buildVariant === "debug" property stringList generalDefines: [ "QT_CREATOR", 'IDE_LIBRARY_BASENAME="' + libDirName + '"', |