diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro index 4c879c13412..463adfa1ee6 100644 --- a/src/plugins/designer/designer.pro +++ b/src/plugins/designer/designer.pro @@ -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) { diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro index af2cbbeab07..042887049b4 100644 --- a/src/plugins/help/help.pro +++ b/src/plugins/help/help.pro @@ -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 += \