diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:14:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:15:56 +0100 |
| commit | d396262bc9771cacbc71e79215768984fa1974ff (patch) | |
| tree | e029399524feabed6ebe0ee1e010af9f5e58932d /examples/multimediawidgets/multimediawidgets.pro | |
| parent | 0ce2cb3ebe6289e3db14438560fa186d9e5186b8 (diff) | |
| parent | 2db2cde0d8433ad1aed59412717c4cddf496ba66 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/multimedia/doc/qtmultimedia.qdocconf
src/plugins/blackberry/mediaplayer/bbmetadata.cpp
src/plugins/blackberry/mediaplayer/bbmetadata.h
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
Diffstat (limited to 'examples/multimediawidgets/multimediawidgets.pro')
| -rw-r--r-- | examples/multimediawidgets/multimediawidgets.pro | 4 |
1 files changed, 2 insertions, 2 deletions
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 } |