diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-10 12:32:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-10 17:04:10 +0200 |
| commit | a439d939e63d6d9be3673877f08d53fd055bfcc3 (patch) | |
| tree | bda1d62335e0ec808d0e2a03aa5176acbfa8e47c | |
| parent | 76287aa2a182d5ada8c9e5cc8405d7006b99d0d8 (diff) | |
Remove more Qt version checks
Change-Id: I4440b7a9fb2c16b10deab8e8abfcb0eaa8bb45bb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | src/plugins/help/help.pro | 2 | ||||
| -rw-r--r-- | src/src.pro | 32 |
2 files changed, 16 insertions, 18 deletions
diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro index 9f806278bb..c296fab572 100644 --- a/src/plugins/help/help.pro +++ b/src/plugins/help/help.pro @@ -62,7 +62,7 @@ FORMS += docsettingspage.ui \ generalsettingspage.ui \ remotehelpfilter.ui -macx:minQtVersion(5, 2, 0) { +osx { DEFINES += QTC_MAC_NATIVE_HELPVIEWER QT += macextras HEADERS += macwebkithelpviewer.h diff --git a/src/src.pro b/src/src.pro index aacdc95e77..06fec5ded6 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,25 +3,23 @@ include(../qtcreator.pri) TEMPLATE = subdirs CONFIG += ordered -minQtVersion(5, 0, 0) { - QBS_DIRS = \ - qbscorelib \ - qbsqtprofilesetup \ - qbsapps \ - qbsplugins \ - qbsstatic +QBS_DIRS = \ + qbscorelib \ + qbsqtprofilesetup \ + qbsapps \ + qbsplugins \ + qbsstatic - qbscorelib.subdir = shared/qbs/src/lib/corelib - qbsqtprofilesetup.subdir = shared/qbs/src/lib/qtprofilesetup - qbsqtprofilesetup.depends = qbscorelib - qbsapps.subdir = shared/qbs/src/app - qbsapps.depends = qbsqtprofilesetup - qbsplugins.subdir = shared/qbs/src/plugins - qbsstatic.file = shared/qbs/static.pro +qbscorelib.subdir = shared/qbs/src/lib/corelib +qbsqtprofilesetup.subdir = shared/qbs/src/lib/qtprofilesetup +qbsqtprofilesetup.depends = qbscorelib +qbsapps.subdir = shared/qbs/src/app +qbsapps.depends = qbsqtprofilesetup +qbsplugins.subdir = shared/qbs/src/plugins +qbsstatic.file = shared/qbs/static.pro - exists(shared/qbs/qbs.pro): SUBDIRS += $$QBS_DIRS - TR_EXCLUDE = $$QBS_DIRS -} +exists(shared/qbs/qbs.pro): SUBDIRS += $$QBS_DIRS +TR_EXCLUDE = $$QBS_DIRS SUBDIRS += \ libs \ |