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/libs/libs.pro | |
parent | b22fbe6b842bfbcfbfe4d9da27e3dc7a35b608e4 (diff) |
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/libs/libs.pro')
-rw-r--r-- | src/libs/libs.pro | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/libs/libs.pro b/src/libs/libs.pro index 94b57dc326..6dc44a10fb 100644 --- a/src/libs/libs.pro +++ b/src/libs/libs.pro @@ -25,23 +25,6 @@ for(l, SUBDIRS) { SUBDIRS += \ utils/process_stub.pro -minQtVersion(5, 0, 0) { - QBS_DIRS = \ - corelib \ - qtprofilesetup \ - apps \ - ../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 - apps.subdir = ../shared/qbs/src/app - apps.depends = qtprofilesetup - - exists(../shared/qbs/qbs.pro): SUBDIRS += $$QBS_DIRS - TR_EXCLUDE = $$QBS_DIRS -} - win32:SUBDIRS += utils/process_ctrlc_stub.pro # Windows: Compile Qt Creator CDB extension if Debugging tools can be detected. |