feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove more Qt version checks

Browse Source 
Change-Id: I4440b7a9fb2c16b10deab8e8abfcb0eaa8bb45bb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Eike Ziller
2014-09-10 12:32:42 +02:00
parent 76287aa2a1
commit a439d939e6
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/help/help.pro
View File

@@ -62,7 +62,7 @@ FORMS += docsettingspage.ui \
generalsettingspage.ui \ generalsettingspage.ui \
remotehelpfilter.ui remotehelpfilter.ui
macx:minQtVersion(5, 2, 0) { osx {
DEFINES += QTC_MAC_NATIVE_HELPVIEWER DEFINES += QTC_MAC_NATIVE_HELPVIEWER
QT += macextras QT += macextras
HEADERS += macwebkithelpviewer.h HEADERS += macwebkithelpviewer.h

32
src/src.pro
View File

@@ -3,25 +3,23 @@ include(../qtcreator.pri)
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
minQtVersion(5, 0, 0) { QBS_DIRS = \
QBS_DIRS = \ qbscorelib \
qbscorelib \ qbsqtprofilesetup \
qbsqtprofilesetup \ qbsapps \
qbsapps \ qbsplugins \
qbsplugins \ qbsstatic
qbsstatic
qbscorelib.subdir = shared/qbs/src/lib/corelib qbscorelib.subdir = shared/qbs/src/lib/corelib
qbsqtprofilesetup.subdir = shared/qbs/src/lib/qtprofilesetup qbsqtprofilesetup.subdir = shared/qbs/src/lib/qtprofilesetup
qbsqtprofilesetup.depends = qbscorelib qbsqtprofilesetup.depends = qbscorelib
qbsapps.subdir = shared/qbs/src/app qbsapps.subdir = shared/qbs/src/app
qbsapps.depends = qbsqtprofilesetup qbsapps.depends = qbsqtprofilesetup
qbsplugins.subdir = shared/qbs/src/plugins qbsplugins.subdir = shared/qbs/src/plugins
qbsstatic.file = shared/qbs/static.pro qbsstatic.file = shared/qbs/static.pro
exists(shared/qbs/qbs.pro): SUBDIRS += $$QBS_DIRS exists(shared/qbs/qbs.pro): SUBDIRS += $$QBS_DIRS
TR_EXCLUDE = $$QBS_DIRS TR_EXCLUDE = $$QBS_DIRS
}
SUBDIRS += \ SUBDIRS += \
libs \ libs \