diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-03-06 14:17:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-03-07 11:37:01 +0100 |
| commit | 59a026594b225fc9e6fd8d4ffa6ee128bf3349ed (patch) | |
| tree | d560fe587892912bb8d2a299361c9022ef2b5d97 /src/plugins/plugins.pro | |
| parent | c86e2872840150fd4d6ab79cda1cdf7fe7aa88eb (diff) | |
Disable Qbs support when compiling with Qt4
Enabling C++11 for compiling the Qbs library gets pretty complicated
with Qt4. Mixing is not advisable (at least not on OS X where a
different stdlib is used in that case).
Change-Id: Ibad56dcf41bfed61f4d8ec8eb46c980768f24faf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index c910d6be58e..8d377df12bc 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -53,6 +53,11 @@ SUBDIRS = \ minQtVersion(5, 0, 0) { SUBDIRS += winrt + + isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR) + exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \ + SUBDIRS += \ + qbsprojectmanager } # prefer qmake variable set on command line over env var @@ -61,11 +66,6 @@ isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR) SUBDIRS += clangcodemodel } -isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR) -exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \ - SUBDIRS += \ - qbsprojectmanager - isEmpty(IDE_PACKAGE_MODE) { SUBDIRS += \ helloworld \ |