diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-21 11:45:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-11 15:15:05 +0100 |
| commit | 4760e1fb02aac87e4186fb1bedf0ba4a3845d7be (patch) | |
| tree | 1c739ae11bfc573a79f8e37fded759f04c963a13 /examples | |
| parent | 07efce437529c1d7e0d7dd15d201949b091b7b2a (diff) | |
make use of qtHaveModule()
Change-Id: I14da5455b7dd4681254e1652395df5f5c65746bd
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/multimedia/multimedia.pro | 4 | ||||
| -rw-r--r-- | examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro | 2 | ||||
| -rw-r--r-- | examples/multimediawidgets/multimediawidgets.pro | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro index 85dc4cd95..bacbba984 100644 --- a/examples/multimedia/multimedia.pro +++ b/examples/multimedia/multimedia.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs SUBDIRS += audiodecoder # These examples all need widgets for now (using creator templates that use widgets) -!isEmpty(QT.widgets.name) { +qtHaveModule(widgets) { SUBDIRS += \ radio \ spectrum \ @@ -13,7 +13,7 @@ SUBDIRS += audiodecoder audiooutput \ } -!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) { +qtHaveModule(gui):qtHaveModule(qml) { SUBDIRS += \ declarative-radio \ video diff --git a/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro b/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro index 387e494c9..2fb123e77 100644 --- a/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro +++ b/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro @@ -3,7 +3,7 @@ TARGET = customvideoitem QT += multimedia multimediawidgets widgets -contains(QT_CONFIG, opengl): QT += opengl +qtHaveModule(opengl): QT += opengl HEADERS += videoplayer.h \ videoitem.h diff --git a/examples/multimediawidgets/multimediawidgets.pro b/examples/multimediawidgets/multimediawidgets.pro index b14ddd263..d8990cdc3 100644 --- a/examples/multimediawidgets/multimediawidgets.pro +++ b/examples/multimediawidgets/multimediawidgets.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs # These examples all need widgets for now (using creator templates that use widgets) -!isEmpty(QT.widgets.name) { +qtHaveModule(widgets) { SUBDIRS += \ camera \ videographicsitem \ @@ -10,7 +10,7 @@ TEMPLATE = subdirs customvideosurface } -!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) { +qtHaveModule(gui):qtHaveModule(qml) { disabled:SUBDIRS += declarative-camera } |