aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/qml/referenceexamples/referenceexamples.pro2
-rw-r--r--src/imports/imports.pro4
-rw-r--r--src/plugins/accessible/accessible.pro2
-rw-r--r--src/plugins/qmltooling/qmltooling.pro2
-rw-r--r--src/src.pro2
-rw-r--r--tests/auto/qml/qml.pro2
-rw-r--r--tests/auto/qml/qqmlecmascript/qqmlecmascript.pro2
-rw-r--r--tests/auto/quick/qquickpathview/qquickpathview.pro2
-rw-r--r--tests/auto/quick/qquicksystempalette/qquicksystempalette.pro2
-rw-r--r--tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro2
-rw-r--r--tests/auto/quick/quick.pro6
-rw-r--r--tests/benchmarks/qml/painting/painting.pro2
-rw-r--r--tests/benchmarks/qml/qml.pro2
-rw-r--r--tools/qmlscene/qmlscene.pro2
-rw-r--r--tools/tools.pro2
15 files changed, 18 insertions, 18 deletions
diff --git a/examples/qml/referenceexamples/referenceexamples.pro b/examples/qml/referenceexamples/referenceexamples.pro
index 4bfbd488ea..ae3b884592 100644
--- a/examples/qml/referenceexamples/referenceexamples.pro
+++ b/examples/qml/referenceexamples/referenceexamples.pro
@@ -12,4 +12,4 @@ SUBDIRS += \
valuesource \
methods
-!contains(QT_CONFIG, no-widgets): SUBDIRS += extended
+qtHaveModule(widgets): SUBDIRS += extended
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 601e9c7e52..72888b2c71 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -4,7 +4,7 @@ SUBDIRS += \
folderlistmodel \
localstorage
-!isEmpty(QT.quick.name) {
+qtHaveModule(quick) {
SUBDIRS += \
qtquick2 \
particles \
@@ -12,4 +12,4 @@ SUBDIRS += \
testlib
}
-contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel
+qtHaveModule(xmlpatterns) : SUBDIRS += xmllistmodel
diff --git a/src/plugins/accessible/accessible.pro b/src/plugins/accessible/accessible.pro
index bff65070c1..b97d323a08 100644
--- a/src/plugins/accessible/accessible.pro
+++ b/src/plugins/accessible/accessible.pro
@@ -1,2 +1,2 @@
TEMPLATE = subdirs
-!isEmpty(QT.quick.name): SUBDIRS += quick
+qtHaveModule(quick): SUBDIRS += quick
diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro
index 3b6a908469..3bc48a6b33 100644
--- a/src/plugins/qmltooling/qmltooling.pro
+++ b/src/plugins/qmltooling/qmltooling.pro
@@ -1,4 +1,4 @@
TEMPLATE = subdirs
SUBDIRS = qmldbg_tcp
-!isEmpty(QT.quick.name): SUBDIRS += qmldbg_qtquick2
+qtHaveModule(quick): SUBDIRS += qmldbg_qtquick2
diff --git a/src/src.pro b/src/src.pro
index 80d859ff49..f593eb8968 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,7 +3,7 @@ CONFIG += ordered
SUBDIRS += \
qml
-!isEmpty(QT.gui.name) {
+qtHaveModule(gui) {
SUBDIRS += \
quick \
qmltest \
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index bbef36167e..b77effe3e5 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -53,7 +53,7 @@ PRIVATETESTS += \
v4 \
qqmltimer
-!contains(QT_CONFIG, no-widgets) {
+qtHaveModule(widgets) {
PUBLICTESTS += \
qjsengine \
qjsvalue
diff --git a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
index 4aff6cf902..bc55ed9376 100644
--- a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
+++ b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
@@ -17,6 +17,6 @@ include (../../shared/util.pri)
TESTDATA = data/*
QT += core-private gui-private v8-private qml-private network testlib
-!contains(QT_CONFIG, no-widgets): QT += widgets
+qtHaveModule(widgets): QT += widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickpathview/qquickpathview.pro b/tests/auto/quick/qquickpathview/qquickpathview.pro
index bd9cc258c2..fb02caebdc 100644
--- a/tests/auto/quick/qquickpathview/qquickpathview.pro
+++ b/tests/auto/quick/qquickpathview/qquickpathview.pro
@@ -10,5 +10,5 @@ include (../shared/util.pri)
TESTDATA = data/*
QT += core-private gui-private v8-private qml-private quick-private testlib
-!contains(QT_CONFIG, no-widgets): QT += widgets
+qtHaveModule(widgets): QT += widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro b/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro
index b6c09479a2..48fd7e8e9a 100644
--- a/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro
+++ b/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro
@@ -6,5 +6,5 @@ SOURCES += tst_qquicksystempalette.cpp
CONFIG += parallel_test
QT += core-private gui-private qml-private quick-private testlib
-!contains(QT_CONFIG, no-widgets): QT += widgets
+qtHaveModule(widgets): QT += widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
index d03cfaa8b4..60ae065910 100644
--- a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
+++ b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
@@ -12,5 +12,5 @@ TESTDATA = data/*
CONFIG += parallel_test
QT += core-private gui-private v8-private qml-private quick-private testlib
-!contains(QT_CONFIG, no-widgets): QT += widgets
+qtHaveModule(widgets): QT += widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 5f18fc94bf..9600d0c7cf 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -5,12 +5,12 @@ PUBLICTESTS += \
rendernode \
qquickpixmapcache
-!contains(QT_CONFIG, no-widgets): PUBLICTESTS += nodes
+qtHaveModule(widgets): PUBLICTESTS += nodes
!cross_compile: PUBLICTESTS += examples
# This test requires the qtconcurrent module
-!contains(QT_CONFIG, concurrent):PUBLICTESTS -= qquickpixmapcache
+!qtHaveModule(concurrent): PUBLICTESTS -= qquickpixmapcache
PRIVATETESTS += \
qquickanimations \
@@ -28,7 +28,7 @@ PRIVATETESTS += \
qquickxmllistmodel
# This test requires the xmlpatterns module
-!contains(QT_CONFIG,xmlpatterns):PRIVATETESTS -= qquickxmllistmodel
+!qtHaveModule(xmlpatterns): PRIVATETESTS -= qquickxmllistmodel
QUICKTESTS = \
qquickaccessible \
diff --git a/tests/benchmarks/qml/painting/painting.pro b/tests/benchmarks/qml/painting/painting.pro
index 3f05185cbe..bde891e12d 100644
--- a/tests/benchmarks/qml/painting/painting.pro
+++ b/tests/benchmarks/qml/painting/painting.pro
@@ -1,4 +1,4 @@
-requires(contains(QT_CONFIG,opengl))
+requires(qtHaveModule(opengl))
QT += opengl
CONFIG += console
diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index 3fbf130969..c50f57b655 100644
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -14,6 +14,6 @@ SUBDIRS += \
js \
qquickwindow
-contains(QT_CONFIG, opengl): SUBDIRS += painting
+qtHaveModule(opengl): SUBDIRS += painting
include(../trusted-benchmarks.pri)
diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro
index 623de41c5c..719110ad71 100644
--- a/tools/qmlscene/qmlscene.pro
+++ b/tools/qmlscene/qmlscene.pro
@@ -1,5 +1,5 @@
QT += qml quick core-private
-!contains(QT_CONFIG, no-widgets):QT += widgets
+qtHaveModule(widgets): QT += widgets
SOURCES += main.cpp
diff --git a/tools/tools.pro b/tools/tools.pro
index abb246f0fe..c193cc97d0 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -6,6 +6,6 @@ SUBDIRS += \
qmlprofiler \
qmlbundle \
qmltestrunner
-!contains(QT_CONFIG, no-widgets):SUBDIRS += qmleasing
+qtHaveModule(widgets): SUBDIRS += qmleasing
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 07:21:49 +0000