From b29abba55166b12d9ce6d599696398845b115d90 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 21 Dec 2012 11:00:42 +0100 Subject: make use of qtHaveModule() Change-Id: I440b609d23570293f21f21a2cb31854366d06bf7 Reviewed-by: Tasuku Suzuki Reviewed-by: Sergio Ahumada Reviewed-by: Joerg Bornemann --- examples/script/calculator/calculator.pro | 2 +- examples/script/context2d/context2d.pro | 2 +- examples/script/qstetrix/qstetrix.pro | 2 +- examples/script/script.pro | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples') 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 -- cgit v1.2.1