make use of qtHaveModule()

Change-Id: I494ad22447fe54be405698f2dfd79e4941019bdc
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/examples/designer/arthurplugin/arthurplugin.pro b/examples/designer/arthurplugin/arthurplugin.pro
index ea09398..9d62718 100644 (file)
--- a/examples/designer/arthurplugin/arthurplugin.pro
+++ b/examples/designer/arthurplugin/arthurplugin.pro
@@ -18,7 +18,7 @@ INSTALLS += target
 
 }
 
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
     DEFINES += QT_OPENGL_SUPPORT
     QT += opengl
 }

diff --git a/examples/examples.pro b/examples/examples.pro
index cacdec5..4955969 100644 (file)
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
-!isEmpty(QT.widgets.name): SUBDIRS += help designer linguist uitools assistant
+qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
 

diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
index 6ebd9ee..168725c 100644 (file)
--- a/src/assistant/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -2,14 +2,14 @@ TEMPLATE = app
 LANGUAGE = C++
 TARGET = assistant
 DESTDIR = $$QT.help.bins
-!isEmpty(QT.webkitwidgets.name) {
+qtHaveModule(webkitwidgets) {
     QT += webkitwidgets
 } else {
     DEFINES += QT_NO_WEBKIT
 }
 !build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 QT += widgets network help sql help
-!isEmpty(QT.printsupport.name): QT += printsupport
+qtHaveModule(printsupport): QT += printsupport
 PROJECTNAME = Assistant
 
 include(../../shared/fontpanel/fontpanel.pri)
@@ -79,7 +79,7 @@ SOURCES += aboutdialog.cpp \
     openpageswidget.cpp \
     openpagesmanager.cpp \
     openpagesswitcher.cpp
-contains(QT_CONFIG, webkitwidgets) {
+qtHaveModule(webkitwidgets) {
     SOURCES += helpviewer_qwv.cpp
 } else {
     SOURCES += helpviewer_qtb.cpp

diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro
index 0a3af78..6eb07fd 100644 (file)
--- a/src/designer/src/designer/designer.pro
+++ b/src/designer/src/designer/designer.pro
@@ -1,6 +1,6 @@
 DESTDIR = $$QT.designer.bins
 QT += core-private widgets xml network designer-private designercomponents
-!isEmpty(QT.printsupport.name): QT += printsupport
+qtHaveModule(printsupport): QT += printsupport
 !build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 
 INCLUDEPATH += \

diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
index 5f04597..44f5e34 100644 (file)
--- a/src/designer/src/plugins/plugins.pro
+++ b/src/designer/src/plugins/plugins.pro
@@ -2,6 +2,6 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 REQUIRES = !CONFIG(static,shared|static)
-# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
-contains(QT_CONFIG, webkitwidgets): SUBDIRS += qwebview
+# qtHaveModule(opengl): SUBDIRS += tools/view3d
+qtHaveModule(webkitwidgets): SUBDIRS += qwebview
 # win32: contains(QT_CONFIG, activeqt): SUBDIRS += activeqt

diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
index 7123998..04b0ab6 100644 (file)
--- a/src/linguist/linguist.pro
+++ b/src/linguist/linguist.pro
@@ -3,7 +3,7 @@ SUBDIRS  = \
     lrelease \
     lupdate \
     lconvert
-!no-png:!isEmpty(QT.widgets.name): SUBDIRS += linguist
+!no-png:qtHaveModule(widgets): SUBDIRS += linguist
 
 win32:CMAKE_BIN_SUFFIX = ".exe"
 

diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
index 795bd10..a19fec0 100644 (file)
--- a/src/linguist/linguist/linguist.pro
+++ b/src/linguist/linguist/linguist.pro
@@ -3,7 +3,7 @@ LANGUAGE = C++
 DESTDIR = $$QT.designer.bins
 
 QT += core-private widgets xml uitools-private
-!isEmpty(QT.printsupport.name): QT += printsupport
+qtHaveModule(printsupport): QT += printsupport
 
 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
 !build_pass:contains(QT_CONFIG, build_all): CONFIG += release

diff --git a/src/linguist/lupdate/lupdate.pro b/src/linguist/lupdate/lupdate.pro
index b9782e9..ee42568 100644 (file)
--- a/src/linguist/lupdate/lupdate.pro
+++ b/src/linguist/lupdate/lupdate.pro
@@ -1,6 +1,6 @@
 QT = core-private
 
-!isEmpty(QT.qmldevtools.name) {
+qtHaveModule(qmldevtools) {
     QT += qmldevtools-private
 } else {
     DEFINES += QT_NO_QML
@@ -20,7 +20,7 @@ SOURCES += \
     java.cpp \
     ui.cpp
 
-!isEmpty(QT.qmldevtools.name): SOURCES += qdeclarative.cpp
+qtHaveModule(qmldevtools): SOURCES += qdeclarative.cpp
 
 HEADERS += \
     lupdate.h \

diff --git a/src/qdbus/qdbus.pro b/src/qdbus/qdbus.pro
index aeb1c96..df1f34f 100644 (file)
--- a/src/qdbus/qdbus.pro
+++ b/src/qdbus/qdbus.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = qdbus
-!isEmpty(QT.widgets.name): SUBDIRS += qdbusviewer
+qtHaveModule(widgets): SUBDIRS += qdbusviewer

diff --git a/src/src.pro b/src/src.pro
index c21cf2e..3799567 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 
-!isEmpty(QT.widgets.name) {
+qtHaveModule(widgets) {
     no-png {
         message("Some graphics-related tools are unavailable without PNG support")
     } else {
@@ -21,7 +21,7 @@ mac {
 
 embedded:SUBDIRS += kmap2qmap
 
-contains(QT_CONFIG, dbus):SUBDIRS += qdbus
+qtHaveModule(dbus): SUBDIRS += qdbus
 # We don't need these command line utilities on embedded platforms.
 embedded: SUBDIRS += makeqpf
 

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 88b2cd1..074aa34 100644 (file)
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -13,7 +13,7 @@ SUBDIRS=\
 cross_compile:SUBDIRS -= host.pro
 
 # These tests need the QtHelp module
-isEmpty(QT.help.name): SUBDIRS -= \
+!qtHaveModule(help): SUBDIRS -= \
     qhelpcontentmodel \
     qhelpenginecore \
     qhelpgenerator \