diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-02 11:03:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-02 13:18:37 +0100 |
| commit | 1e5566c2e98098b0f7d7628f62425eec569f3a34 (patch) | |
| tree | 4e4df86836b5103b864bbc9a9fc86d2622bccda3 | |
| parent | 13c19db171ffaebb748e521f75a59f96c44cedca (diff) | |
Revert "Fix build with -no-feature-printer"
This reverts commit de8bd9ec6b21e3b43b08c4c2588b5116a7ca8ece.
We need to keep the empty printsupport library for ios at least.
Fixes: QTBUG-79124
Task-number: QTBUG-80323
Change-Id: I543a76a897eec2c9bc51a3f2d080be3a9cc07871
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | src/src.pro | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/src.pro b/src/src.pro index b704ccd7ab..1c76a2e46f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,10 +1,8 @@ TEMPLATE = subdirs -QT_FOR_CONFIG += core-private gui-private printsupport - +QT_FOR_CONFIG += core-private gui-private include($$OUT_PWD/corelib/qtcore-config.pri) include($$OUT_PWD/gui/qtgui-config.pri) -include($$OUT_PWD/printsupport/qtprintsupport-config.pri) force_bootstrap|!qtConfig(commandlineparser): \ CONFIG += force_dbus_bootstrap @@ -223,13 +221,11 @@ qtConfig(gui) { src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers qtConfig(widgets) { SUBDIRS += src_tools_uic src_widgets + !android-embedded: SUBDIRS += src_printsupport TOOLS += src_tools_uic src_plugins.depends += src_widgets + !android-embedded: src_plugins.depends += src_printsupport src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers - qtConfig(printer) { - SUBDIRS += src_printsupport - src_plugins.depends += src_printsupport - } qtConfig(opengl) { SUBDIRS += src_opengl src_plugins.depends += src_opengl |