diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/coreplugin/coreplugin.pro | 2 | ||||
-rw-r--r-- | src/plugins/debugger/lldb/guest/qtcreator-lldb.pro | 4 | ||||
-rw-r--r-- | src/plugins/designer/designer.pro | 1 | ||||
-rw-r--r-- | src/plugins/help/help.pro | 5 | ||||
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofiler.pro | 4 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditor.pro | 1 |
6 files changed, 13 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index dd65b38cee..c65054df86 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -4,6 +4,8 @@ DEFINES += CORE_LIBRARY QT += network \ script \ sql +greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport + CONFIG += help include(../../qtcreatorplugin.pri) include(../../libs/utils/utils.pri) diff --git a/src/plugins/debugger/lldb/guest/qtcreator-lldb.pro b/src/plugins/debugger/lldb/guest/qtcreator-lldb.pro index 55688aad53..847e31140c 100644 --- a/src/plugins/debugger/lldb/guest/qtcreator-lldb.pro +++ b/src/plugins/debugger/lldb/guest/qtcreator-lldb.pro @@ -3,6 +3,8 @@ WITH_LLDB = $$(WITH_LLDB) !macx: error (This can only be built on mac) !exists($${WITH_LLDB}/include/lldb/lldb-enumerations.h): error(please see the README for build instructions) +QT = core network + include(../../../../../qtcreator.pri) TEMPLATE = app CONFIG -= app_bundle @@ -12,8 +14,6 @@ DEPENDPATH += . .. ../.. ../../.. ../../../../libs INCLUDEPATH += . .. ../.. ../../.. ../../../../libs DESTDIR = $$IDE_LIBEXEC_PATH -QT = core network - MOC_DIR=.tmp OBJECTS_DIR=.tmp diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro index 21559fdbea..aafd3c8fc2 100644 --- a/src/plugins/designer/designer.pro +++ b/src/plugins/designer/designer.pro @@ -13,6 +13,7 @@ minQtVersion(5, 0, 0) { CONFIG += designer # -- Fixme: Make tools available INCLUDEPATH += $$QMAKE_INCDIR_QT/../../qttools/include + QT += printsupport } 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 c5616d2df1..af2cbbeab0 100644 --- a/src/plugins/help/help.pro +++ b/src/plugins/help/help.pro @@ -1,6 +1,11 @@ TEMPLATE = lib TARGET = Help + QT += network +greaterThan(QT_MAJOR_VERSION, 4) { + QT += printsupport + DEFINES += QT_NO_WEBKIT +} INCLUDEPATH += $$PWD diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro index 533fe433f0..88b732031c 100644 --- a/src/plugins/qmlprofiler/qmlprofiler.pro +++ b/src/plugins/qmlprofiler/qmlprofiler.pro @@ -3,6 +3,8 @@ TARGET = QmlProfiler DEFINES += PROFILER_LIBRARY +QT += network script declarative + include(../../qtcreatorplugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/analyzerbase/analyzerbase.pri) @@ -12,8 +14,6 @@ include(../../plugins/remotelinux/remotelinux.pri) include(../../libs/qmljsdebugclient/qmljsdebugclient.pri) include(../../libs/extensionsystem/extensionsystem.pri) -QT += network script declarative - include(canvas/canvas.pri) SOURCES += \ diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro index afe8095614..56d8547756 100644 --- a/src/plugins/texteditor/texteditor.pro +++ b/src/plugins/texteditor/texteditor.pro @@ -2,6 +2,7 @@ TEMPLATE = lib TARGET = TextEditor DEFINES += TEXTEDITOR_LIBRARY QT += xml network +greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport include(../../qtcreatorplugin.pri) include(texteditor_dependencies.pri) INCLUDEPATH += generichighlighter \ |