Make it possible to disable the PrintSupport module
Introduce the 'printsupport' feature to control whether the PrintSupport module is built. [ChangeLog][QtPrintSupport] Building of QtPrintSupport can be disabled by passing -no-feature-printsupport to configure. Fixes: QTBUG-90778 Change-Id: I8a9a4b7f8dd8f39a81565c8eb14ce1ae0839267d Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Nodir Temirkhodjaev <nodir.temir@gmail.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>bb10
parent
841e63cb77
commit
9d84bafeba
|
|
@ -885,6 +885,10 @@ qt_feature_config("gui" QMAKE_PUBLIC_QT_CONFIG
|
|||
qt_feature("network" PRIVATE
|
||||
LABEL "Qt Network"
|
||||
)
|
||||
qt_feature("printsupport" PRIVATE
|
||||
LABEL "Qt PrintSupport"
|
||||
CONDITION QT_FEATURE_widgets
|
||||
)
|
||||
qt_feature("sql" PRIVATE
|
||||
LABEL "Qt Sql"
|
||||
CONDITION QT_FEATURE_thread
|
||||
|
|
|
|||
|
|
@ -898,6 +898,10 @@ qt_feature_config("gui" QMAKE_PUBLIC_QT_CONFIG
|
|||
qt_feature("network" PRIVATE
|
||||
LABEL "Qt Network"
|
||||
)
|
||||
qt_feature("printsupport" PRIVATE
|
||||
LABEL "Qt PrintSupport"
|
||||
CONDITION QT_FEATURE_widgets
|
||||
)
|
||||
qt_feature("sql" PRIVATE
|
||||
LABEL "Qt Sql"
|
||||
CONDITION QT_FEATURE_thread
|
||||
|
|
|
|||
|
|
@ -1344,6 +1344,11 @@
|
|||
"label": "Qt Network",
|
||||
"output": [ "privateFeature" ]
|
||||
},
|
||||
"printsupport": {
|
||||
"label": "Qt PrintSupport",
|
||||
"condition": "features.widgets",
|
||||
"output": [ "privateFeature" ]
|
||||
},
|
||||
"sql": {
|
||||
"label": "Qt Sql",
|
||||
"condition": "features.thread",
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ endif()
|
|||
if (QT_FEATURE_testlib)
|
||||
add_subdirectory(testlib)
|
||||
endif()
|
||||
if(QT_FEATURE_gui AND QT_FEATURE_widgets)
|
||||
if(QT_FEATURE_printsupport)
|
||||
add_subdirectory(printsupport)
|
||||
endif()
|
||||
add_subdirectory(plugins)
|
||||
|
|
|
|||
Loading…
Reference in New Issue