diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-07-09 12:38:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-07-09 14:44:36 +0200 |
| commit | 13346936c6039056cc5c6e3e94bec02a2d51135e (patch) | |
| tree | b6a65479487fe838ad3caeb3a2d3e35084502c2d /src/src.pro | |
| parent | b22fbe6b842bfbcfbfe4d9da27e3dc7a35b608e4 (diff) | |
| download | qt-creator-13346936c6039056cc5c6e3e94bec02a2d51135e.tar.gz | |
Qbs: Avoid subdirs with ..
It is not really supported and has subtle issues, which result
qmake no longer finding the generated .qmake.cache for Qbs
(e.g. when Qt Creator is a subdir of another .pro file).
Change-Id: I7a4a1bb6bbde83966daeeccd68165981b6f90e03
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 2f986ab2e1..56a00a8e84 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,7 +1,29 @@ +include(../qtcreator.pri) + TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = \ +minQtVersion(5, 0, 0) { + QBS_DIRS = \ + qbscorelib \ + qbsqtprofilesetup \ + qbsapps \ + qbsplugins \ + qbsstatic + + qbscorelib.subdir = shared/qbs/src/lib/corelib + qbsqtprofilesetup.subdir = shared/qbs/src/lib/qtprofilesetup + qbsqtprofilesetup.depends = corelib + qbsapps.subdir = shared/qbs/src/app + qbsapps.depends = qtprofilesetup + qbsplugins.subdir = shared/qbs/src/plugins + qbsstatic.file = shared/qbs/static.pro + + exists(shared/qbs/qbs.pro): SUBDIRS += $$QBS_DIRS + TR_EXCLUDE = $$QBS_DIRS +} + +SUBDIRS += \ libs \ app \ plugins \ |