1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with -no-feature-printer

Browse Source 
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>
This commit is contained in:
Kai Koehne 2019-07-09 17:19:26 +02:00
parent cc32226e64
commit de8bd9ec6b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/src.pro
View File

@ -1,8 +1,10 @@
TEMPLATE = subdirs 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/corelib/qtcore-config.pri)
include($$OUT_PWD/gui/qtgui-config.pri) include($$OUT_PWD/gui/qtgui-config.pri)
include($$OUT_PWD/printsupport/qtprintsupport-config.pri)
force_bootstrap|!qtConfig(commandlineparser): \ force_bootstrap|!qtConfig(commandlineparser): \
CONFIG += force_dbus_bootstrap CONFIG += force_dbus_bootstrap
@ -221,11 +223,13 @@ qtConfig(gui) {
src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers
qtConfig(widgets) { qtConfig(widgets) {
SUBDIRS += src_tools_uic src_widgets SUBDIRS += src_tools_uic src_widgets
!android-embedded: SUBDIRS += src_printsupport
TOOLS += src_tools_uic TOOLS += src_tools_uic
src_plugins.depends += src_widgets 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 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) { qtConfig(opengl) {
SUBDIRS += src_opengl SUBDIRS += src_opengl
src_plugins.depends += src_opengl src_plugins.depends += src_opengl