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

Fix qmake-warnings in Qt 5.

Browse Source 
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:
Friedemann Kleint
2012-07-30 15:11:47 +02:00
committed by Oswald Buddenhagen
parent ec6f0db848
commit f03a76e1ca
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/designer/designer.pro
View File

@@ -9,11 +9,8 @@ include(designer_dependencies.pri)
INCLUDEPATH += ../../tools/utils INCLUDEPATH += ../../tools/utils
minQtVersion(5, 0, 0) { greaterThan(QT_MAJOR_VERSION, 4) {
CONFIG += designer QT += printsupport designer
# -- Fixme: Make tools available
INCLUDEPATH += $$QMAKE_INCDIR_QT/../../qttools/include
QT += printsupport
} else { } else {
# -- figure out shared dir location # -- figure out shared dir location
!exists($$[QT_INSTALL_HEADERS]/QtDesigner/private/qdesigner_integration_p.h) { !exists($$[QT_INSTALL_HEADERS]/QtDesigner/private/qdesigner_integration_p.h) {

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

@@ -3,8 +3,10 @@ TARGET = Help
QT += network QT += network
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
QT += printsupport QT += printsupport help
DEFINES += QT_NO_WEBKIT DEFINES += QT_NO_WEBKIT
} else {
CONFIG += help
} }
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
@@ -12,7 +14,6 @@ INCLUDEPATH += $$PWD
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(help_dependencies.pri) include(help_dependencies.pri)
CONFIG += help
DEFINES += QT_CLUCENE_SUPPORT HELP_LIBRARY DEFINES += QT_CLUCENE_SUPPORT HELP_LIBRARY
HEADERS += \ HEADERS += \