forked from qt-creator/qt-creator
Fix qmake-warnings in Qt 5.
Use QT += help, designer, clean up Designer include hack. Change-Id: I630cc7575d541ba4dc6c5cbecd335dbb8167e1c9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
committed by
Oswald Buddenhagen
parent
ec6f0db848
commit
f03a76e1ca
@@ -9,11 +9,8 @@ include(designer_dependencies.pri)
|
||||
|
||||
INCLUDEPATH += ../../tools/utils
|
||||
|
||||
minQtVersion(5, 0, 0) {
|
||||
CONFIG += designer
|
||||
# -- Fixme: Make tools available
|
||||
INCLUDEPATH += $$QMAKE_INCDIR_QT/../../qttools/include
|
||||
QT += printsupport
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
QT += printsupport designer
|
||||
} else {
|
||||
# -- figure out shared dir location
|
||||
!exists($$[QT_INSTALL_HEADERS]/QtDesigner/private/qdesigner_integration_p.h) {
|
||||
|
@@ -3,8 +3,10 @@ TARGET = Help
|
||||
|
||||
QT += network
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
QT += printsupport
|
||||
QT += printsupport help
|
||||
DEFINES += QT_NO_WEBKIT
|
||||
} else {
|
||||
CONFIG += help
|
||||
}
|
||||
|
||||
INCLUDEPATH += $$PWD
|
||||
@@ -12,7 +14,6 @@ INCLUDEPATH += $$PWD
|
||||
include(../../qtcreatorplugin.pri)
|
||||
include(help_dependencies.pri)
|
||||
|
||||
CONFIG += help
|
||||
DEFINES += QT_CLUCENE_SUPPORT HELP_LIBRARY
|
||||
|
||||
HEADERS += \
|
||||
|
Reference in New Issue
Block a user