diff options
| -rw-r--r-- | examples/script/calculator/calculator.pro | 2 | ||||
| -rw-r--r-- | examples/script/context2d/context2d.pro | 2 | ||||
| -rw-r--r-- | examples/script/qstetrix/qstetrix.pro | 2 | ||||
| -rw-r--r-- | examples/script/script.pro | 4 | ||||
| -rw-r--r-- | src/plugins/script/script.pro | 2 | ||||
| -rw-r--r-- | src/scripttools/debugging/debugging.pri | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 4 |
8 files changed, 10 insertions, 10 deletions
diff --git a/examples/script/calculator/calculator.pro b/examples/script/calculator/calculator.pro index a52e892..985147a 100644 --- a/examples/script/calculator/calculator.pro +++ b/examples/script/calculator/calculator.pro @@ -3,7 +3,7 @@ RESOURCES += calculator.qrc SOURCES += main.cpp QMAKE_PROJECT_NAME = scripted_calculator -contains(QT_CONFIG, scripttools): QT += scripttools +qtHaveModule(scripttools): QT += scripttools target.path = $$[QT_INSTALL_EXAMPLES]/script/calculator INSTALLS += target diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro index 6640c33..483f45b 100644 --- a/examples/script/context2d/context2d.pro +++ b/examples/script/context2d/context2d.pro @@ -14,7 +14,7 @@ SOURCES += qcontext2dcanvas.cpp \ main.cpp RESOURCES += context2d.qrc -contains(QT_CONFIG, scripttools): QT += scripttools +qtHaveModule(scripttools): QT += scripttools target.path = $$[QT_INSTALL_EXAMPLES]/script/context2d INSTALLS += target diff --git a/examples/script/qstetrix/qstetrix.pro b/examples/script/qstetrix/qstetrix.pro index 08b972c..6d4bb1c 100644 --- a/examples/script/qstetrix/qstetrix.pro +++ b/examples/script/qstetrix/qstetrix.pro @@ -6,7 +6,7 @@ SOURCES = main.cpp \ RESOURCES = tetrix.qrc -contains(QT_CONFIG, scripttools): QT += scripttools +qtHaveModule(scripttools): QT += scripttools target.path = $$[QT_INSTALL_EXAMPLES]/script/qstetrix INSTALLS += target diff --git a/examples/script/script.pro b/examples/script/script.pro index 245824c..3e1eae6 100644 --- a/examples/script/script.pro +++ b/examples/script/script.pro @@ -3,13 +3,13 @@ SUBDIRS = \ customclass \ qsdbg -!isEmpty(QT.widgets.name) { +qtHaveModule(widgets) { SUBDIRS += \ helloscript \ context2d \ defaultprototypes - !isEmpty(QT.uitools.name) { + qtHaveModule(uitools) { SUBDIRS += \ calculator \ qstetrix diff --git a/src/plugins/script/script.pro b/src/plugins/script/script.pro index eaae56b..b8d97de 100644 --- a/src/plugins/script/script.pro +++ b/src/plugins/script/script.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -contains(QT_CONFIG, script):contains(QT_CONFIG, dbus):SUBDIRS += qtdbus +qtHaveModule(dbus): SUBDIRS += qtdbus diff --git a/src/scripttools/debugging/debugging.pri b/src/scripttools/debugging/debugging.pri index b7e8a95..254e960 100644 --- a/src/scripttools/debugging/debugging.pri +++ b/src/scripttools/debugging/debugging.pri @@ -158,4 +158,4 @@ SOURCES += \ HEADERS += \ $$PWD/qscriptenginedebugger.h -!contains(QT_CONFIG, svg) DEFINES *= QT_NO_SVG +!qtHaveModule(svg): DEFINES *= QT_NO_SVG diff --git a/src/src.pro b/src/src.pro index f9d8b19..e81b193 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS += script -!isEmpty(QT.widgets.name): SUBDIRS += scripttools +qtHaveModule(widgets): SUBDIRS += scripttools diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 1d1ba0f..07b696c 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -17,11 +17,11 @@ SUBDIRS=\ qscriptqwidgets \ cmake \ -!contains(QT_CONFIG, private_tests):SUBDIRS -= \ +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ qscriptcontext \ qscriptengineagent -isEmpty(QT.widgets.name):SUBDIRS -= \ +!qtHaveModule(widgets):SUBDIRS -= \ qscriptable \ qscriptengine \ qscriptenginedebugger \ |