diff options
author | Kai Koehne <kai.koehne@qt.io> | 2019-07-09 17:19:26 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2019-07-11 13:58:36 +0200 |
commit | de8bd9ec6b21e3b43b08c4c2588b5116a7ca8ece (patch) | |
tree | 01a55f0cf6938e6931dc1595d6dc00d74be16957 /src/src.pro | |
parent | cc32226e647854a02ecd0775787bb08b85e2a014 (diff) |
Fix build with -no-feature-printer
Skip printsupport subdirectory if printer feature is disabled. Also
removed android-embedded condition for the plugin: Such a
configuration should just disable the printer feature.
Fixes: QTBUG-76941
Change-Id: Ifca7d2311a575c1589ad6a87a775bd016591ee2c
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/src.pro')
-rw-r--r-- | src/src.pro | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/src.pro b/src/src.pro index 1c76a2e46f..b704ccd7ab 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,8 +1,10 @@ TEMPLATE = subdirs -QT_FOR_CONFIG += core-private gui-private +QT_FOR_CONFIG += core-private gui-private printsupport + 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 @@ -221,11 +223,13 @@ 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 |