add and use qtHaveModule() function

this is much more elegant than the so far propagated !isEmpty(QT.foo.name).
also replace feature-specific tests (no-gui and no-widgets) and the
obsolete contains(QT_CONFIG, foo) syntax.

Change-Id: Ia4b3c8febcabf9eeca67b1f9173a523820b1038b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

21 files changed, 23 insertions, 23 deletions

diff --git a/examples/widgets/animation/sub-attaq/sub-attaq.pro b/examples/widgets/animation/sub-attaq/sub-attaq.pro
index 3ed823d1e6..ac79fd4249 100644
--- a/examples/widgets/animation/sub-attaq/sub-attaq.pro
+++ b/examples/widgets/animation/sub-attaq/sub-attaq.pro
@@ -1,5 +1,5 @@
 QT += widgets
-contains(QT_CONFIG, opengl):QT += opengl
+qtHaveModule(opengl): QT += opengl
 HEADERS += boat.h \
     bomb.h \
     mainwindow.h \
diff --git a/examples/widgets/graphicsview/chip/chip.pro b/examples/widgets/graphicsview/chip/chip.pro
index 8e3d91f38e..a46f07ce35 100644
--- a/examples/widgets/graphicsview/chip/chip.pro
+++ b/examples/widgets/graphicsview/chip/chip.pro
@@ -5,8 +5,8 @@ SOURCES += main.cpp
 SOURCES += mainwindow.cpp view.cpp chip.cpp
 
 QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
-contains(QT_CONFIG, opengl):QT += opengl
+qtHaveModule(printsupport): QT += printsupport
+qtHaveModule(opengl): QT += opengl
 
 build_all:!build_pass {
     CONFIG -= build_all
diff --git a/examples/widgets/graphicsview/graphicsview.pro b/examples/widgets/graphicsview/graphicsview.pro
index 901533a8de..9d6d7a75f6 100644
--- a/examples/widgets/graphicsview/graphicsview.pro
+++ b/examples/widgets/graphicsview/graphicsview.pro
@@ -15,6 +15,6 @@ SUBDIRS       = \
 
 contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot
 
-contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles2):{
+qtHaveModule(opengl):!contains(QT_CONFIG, opengles.) {
     SUBDIRS += boxes
 }
diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.pro b/examples/widgets/graphicsview/padnavigator/padnavigator.pro
index 460cc90219..c2bc79b5cc 100644
--- a/examples/widgets/graphicsview/padnavigator/padnavigator.pro
+++ b/examples/widgets/graphicsview/padnavigator/padnavigator.pro
@@ -17,7 +17,7 @@ FORMS += \
     form.ui
 
 QT += widgets
-contains(QT_CONFIG, opengl):QT += opengl
+qtHaveModule(opengl): QT += opengl
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/padnavigator
diff --git a/examples/widgets/itemviews/pixelator/pixelator.pro b/examples/widgets/itemviews/pixelator/pixelator.pro
index b844e7c3a4..35176a6026 100644
--- a/examples/widgets/itemviews/pixelator/pixelator.pro
+++ b/examples/widgets/itemviews/pixelator/pixelator.pro
@@ -1,5 +1,5 @@
 QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
+qtHaveModule(printsupport): QT += printsupport
 
 HEADERS     = imagemodel.h \
               mainwindow.h \
diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.pro b/examples/widgets/itemviews/spreadsheet/spreadsheet.pro
index b69811a4b8..56f7424a93 100644
--- a/examples/widgets/itemviews/spreadsheet/spreadsheet.pro
+++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.pro
@@ -1,6 +1,6 @@
 QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
-#unix:contains(QT_CONFIG, dbus):QT += dbus widgets
+qtHaveModule(printsupport): QT += printsupport
+#unix:qtHaveModule(dbus): QT += dbus widgets
 
 HEADERS += printview.h spreadsheet.h spreadsheetdelegate.h spreadsheetitem.h
 SOURCES += main.cpp \
diff --git a/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro b/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro
index 4bccf49399..f445c5a89e 100644
--- a/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro
+++ b/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro
@@ -1,5 +1,5 @@
 QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
+qtHaveModule(printsupport): QT += printsupport
 
 HEADERS         = mainwindow.h
 SOURCES         = main.cpp \
diff --git a/examples/widgets/painting/affine/affine.pro b/examples/widgets/painting/affine/affine.pro
index e94f4d12fb..1f2f8df87f 100644
--- a/examples/widgets/painting/affine/affine.pro
+++ b/examples/widgets/painting/affine/affine.pro
@@ -1,7 +1,7 @@
 SOURCES += main.cpp xform.cpp
 HEADERS += xform.h
 
-contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
 	QT += opengl
 }
diff --git a/examples/widgets/painting/composition/composition.pro b/examples/widgets/painting/composition/composition.pro
index 7ff82d789a..0269945ac8 100644
--- a/examples/widgets/painting/composition/composition.pro
+++ b/examples/widgets/painting/composition/composition.pro
@@ -6,7 +6,7 @@ SHARED_FOLDER = ../shared
 include($$SHARED_FOLDER/shared.pri)
 
 RESOURCES += composition.qrc
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
 	QT += opengl
 }
diff --git a/examples/widgets/painting/deform/deform.pro b/examples/widgets/painting/deform/deform.pro
index 01dc0a869c..6409aaed96 100644
--- a/examples/widgets/painting/deform/deform.pro
+++ b/examples/widgets/painting/deform/deform.pro
@@ -7,7 +7,7 @@ include($$SHARED_FOLDER/shared.pri)
 
 RESOURCES += deform.qrc
 
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
 	QT += opengl
 }
diff --git a/examples/widgets/painting/fontsampler/fontsampler.pro b/examples/widgets/painting/fontsampler/fontsampler.pro
index 8325da0175..08dd07bc08 100644
--- a/examples/widgets/painting/fontsampler/fontsampler.pro
+++ b/examples/widgets/painting/fontsampler/fontsampler.pro
@@ -1,5 +1,5 @@
 QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
+qtHaveModule(printsupport): QT += printsupport
 
 FORMS     = mainwindowbase.ui
 HEADERS   = mainwindow.h
diff --git a/examples/widgets/painting/gradients/gradients.pro b/examples/widgets/painting/gradients/gradients.pro
index a7d6ae68d1..73f3974c62 100644
--- a/examples/widgets/painting/gradients/gradients.pro
+++ b/examples/widgets/painting/gradients/gradients.pro
@@ -6,7 +6,7 @@ SHARED_FOLDER = ../shared
 include($$SHARED_FOLDER/shared.pri)
 
 RESOURCES += gradients.qrc
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
 	QT += opengl
 }
diff --git a/examples/widgets/painting/pathstroke/pathstroke.pro b/examples/widgets/painting/pathstroke/pathstroke.pro
index 197fe22024..8ab3cb9244 100644
--- a/examples/widgets/painting/pathstroke/pathstroke.pro
+++ b/examples/widgets/painting/pathstroke/pathstroke.pro
@@ -7,7 +7,7 @@ include($$SHARED_FOLDER/shared.pri)
 
 RESOURCES += pathstroke.qrc
 
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
 	QT += opengl
 }
diff --git a/examples/widgets/painting/shared/shared.pri b/examples/widgets/painting/shared/shared.pri
index 6aef1bdd5b..1b8be82d03 100644
--- a/examples/widgets/painting/shared/shared.pri
+++ b/examples/widgets/painting/shared/shared.pri
@@ -1,6 +1,6 @@
 INCLUDEPATH += $$PWD
 
-contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+qtHaveModule(opengl) {
     DEFINES += QT_OPENGL_SUPPORT
     QT += opengl widgets
 }
diff --git a/examples/widgets/painting/shared/shared.pro b/examples/widgets/painting/shared/shared.pro
index 42b474a946..2756bf75ca 100644
--- a/examples/widgets/painting/shared/shared.pro
+++ b/examples/widgets/painting/shared/shared.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += static
 
-contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+qtHaveModule(opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
 	QT += opengl
 }
diff --git a/examples/widgets/richtext/orderform/orderform.pro b/examples/widgets/richtext/orderform/orderform.pro
index 1477d6ecab..0eb9da3ae1 100644
--- a/examples/widgets/richtext/orderform/orderform.pro
+++ b/examples/widgets/richtext/orderform/orderform.pro
@@ -1,5 +1,5 @@
 QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
+qtHaveModule(printsupport): QT += printsupport
 
 HEADERS     = detailsdialog.h \
               mainwindow.h
diff --git a/examples/widgets/richtext/textedit/textedit.pro b/examples/widgets/richtext/textedit/textedit.pro
index 36f860c5a8..c32bf68f68 100644
--- a/examples/widgets/richtext/textedit/textedit.pro
+++ b/examples/widgets/richtext/textedit/textedit.pro
@@ -1,5 +1,5 @@
 QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
+qtHaveModule(printsupport): QT += printsupport
 
 TEMPLATE        = app
 TARGET          = textedit
diff --git a/examples/widgets/statemachine/statemachine.pro b/examples/widgets/statemachine/statemachine.pro
index 2a539d2e54..926e01cfda 100644
--- a/examples/widgets/statemachine/statemachine.pro
+++ b/examples/widgets/statemachine/statemachine.pro
@@ -3,7 +3,7 @@ SUBDIRS       = \
                 factorial \
                 pingpong
 
-!contains(QT_CONFIG, no-widgets) {
+qtHaveModule(widgets) {
     SUBDIRS +=  \
                 eventtransitions \
                 rogue \
diff --git a/examples/widgets/tutorials/threads/threads.pro b/examples/widgets/tutorials/threads/threads.pro
index 4d51120794..19718d760c 100644
--- a/examples/widgets/tutorials/threads/threads.pro
+++ b/examples/widgets/tutorials/threads/threads.pro
@@ -5,4 +5,4 @@ SUBDIRS = hellothread \
           clock \
           movedobject 
 
-contains(QT_CONFIG, concurrent): SUBDIRS += helloconcurrent
+qtHaveModule(concurrent): SUBDIRS += helloconcurrent
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.pro b/examples/widgets/widgets/imageviewer/imageviewer.pro
index 3378db7fb6..a0f9cebbda 100644
--- a/examples/widgets/widgets/imageviewer/imageviewer.pro
+++ b/examples/widgets/widgets/imageviewer/imageviewer.pro
@@ -1,5 +1,5 @@
 QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
+qtHaveModule(printsupport): QT += printsupport
 
 HEADERS       = imageviewer.h
 SOURCES       = imageviewer.cpp \
diff --git a/examples/widgets/widgets/scribble/scribble.pro b/examples/widgets/widgets/scribble/scribble.pro
index 8c35ba777f..aff0fb442c 100644
--- a/examples/widgets/widgets/scribble/scribble.pro
+++ b/examples/widgets/widgets/scribble/scribble.pro
@@ -1,5 +1,5 @@
 QT += widgets
-!isEmpty(QT.printsupport.name): QT += printsupport
+qtHaveModule(printsupport): QT += printsupport
 
 HEADERS       = mainwindow.h \
                 scribblearea.h