summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.prev_configure.cmake4
-rw-r--r--configure.cmake4
-rw-r--r--configure.json5
-rw-r--r--src/CMakeLists.txt2
4 files changed, 14 insertions, 1 deletions
diff --git a/.prev_configure.cmake b/.prev_configure.cmake
index 75081a87c9..e7606105f3 100644
--- a/.prev_configure.cmake
+++ b/.prev_configure.cmake
@@ -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
diff --git a/configure.cmake b/configure.cmake
index d0767902c8..830a408b7b 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -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
diff --git a/configure.json b/configure.json
index a9249e1ed2..84798d3a0e 100644
--- a/configure.json
+++ b/configure.json
@@ -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",
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf71322b44..62daf295e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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)