diff --git a/README b/README index 535a44a0c43bcce84973d83388b4b60e7f9af298..8d8e88d0d3b9d8712dce67bf2518bffcb92c31d0 100644 --- a/README +++ b/README @@ -12,7 +12,7 @@ Mac OS X 10.7 or later Building the sources requires Qt 5.2.0 or later. It is also possible to build with Qt 4.8.x, but in that case the Welcome mode, -Qt Quick Designer and QML Profiler are disabled. +Qt Quick Designer, QML Profiler and Qbs support are disabled. Compiling Qt Creator ==================== diff --git a/src/libs/libs.pro b/src/libs/libs.pro index 894d867b4c3910d9a23e7e2c8a14b66c6f5f5bd3..085a014bd0f2583149dfa466dca7f70f7db49bcf 100644 --- a/src/libs/libs.pro +++ b/src/libs/libs.pro @@ -1,3 +1,5 @@ +include(../../qtcreator.pri) + TEMPLATE = subdirs SUBDIRS = \ @@ -23,17 +25,19 @@ for(l, SUBDIRS) { SUBDIRS += \ utils/process_stub.pro -QBS_DIRS = \ - corelib \ - qtprofilesetup \ - ../shared/qbs/src/plugins \ - ../shared/qbs/static.pro -corelib.subdir = ../shared/qbs/src/lib/corelib -qtprofilesetup.subdir = ../shared/qbs/src/lib/qtprofilesetup -qtprofilesetup.depends = corelib - -exists(../shared/qbs/qbs.pro): SUBDIRS += $$QBS_DIRS -TR_EXCLUDE = $$QBS_DIRS +minQtVersion(5, 0, 0) { + QBS_DIRS = \ + corelib \ + qtprofilesetup \ + ../shared/qbs/src/plugins \ + ../shared/qbs/static.pro + corelib.subdir = ../shared/qbs/src/lib/corelib + qtprofilesetup.subdir = ../shared/qbs/src/lib/qtprofilesetup + qtprofilesetup.depends = corelib + + exists(../shared/qbs/qbs.pro): SUBDIRS += $$QBS_DIRS + TR_EXCLUDE = $$QBS_DIRS +} win32:SUBDIRS += utils/process_ctrlc_stub.pro diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index c910d6be58e09015e9d83a486c978cb4bdbe632e..8d377df12bcbea03126f9260138857bf89e4da6b 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 \