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 /src/src.qbs | |
| parent | f4520bafaccb0832266f8d88f254e910ed7a23f4 (diff) | |
| parent | 4b2cc015f867941a7ae35a38d81ec9daa5616711 (diff) | |
| download | qt-creator-0fb641c90e64054a28a39e3f48d96f953399805a.tar.gz | |
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 'src/src.qbs')
| -rw-r--r-- | src/src.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.qbs b/src/src.qbs index d5dc32d041..f91f90212e 100644 --- a/src/src.qbs +++ b/src/src.qbs @@ -12,7 +12,7 @@ Project { ] property bool qbsSubModuleExists: File.exists(qbsProject.qbsBaseDir + "/qbs.qbs") - property path qbs_install_dir: qbs.getenv("QBS_INSTALL_DIR") + property path qbs_install_dir: qbs.getEnv("QBS_INSTALL_DIR") property bool useExternalQbs: qbs_install_dir property bool buildQbsProjectManager: useExternalQbs || qbsSubModuleExists Project { |