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 /src/plugins/qt7/qt7.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 'src/plugins/qt7/qt7.pro')
| -rw-r--r-- | src/plugins/qt7/qt7.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro index ae87bd44a..b23eba40a 100644 --- a/src/plugins/qt7/qt7.pro +++ b/src/plugins/qt7/qt7.pro @@ -3,7 +3,7 @@ CONFIG += no_keywords TARGET = qqt7engine QT += multimedia-private network -!isEmpty(QT.widgets.name) { +qtHaveModule(widgets) { QT += multimediawidgets-private widgets } @@ -23,7 +23,7 @@ LIBS += -framework AppKit -framework AudioUnit \ # QUICKTIME_C_API_AVAILABLE is true only on i386 # so make sure to link QuickTime -contains(QMAKE_HOST.arch, i386) { +contains(QT_ARCH, i386) { LIBS += -framework QuickTime } @@ -50,7 +50,7 @@ OBJECTIVE_SOURCES += \ qt7ciimagevideobuffer.mm \ qcvdisplaylink.mm - !isEmpty(QT.widgets.name) { + qtHaveModule(widgets) { HEADERS += \ qt7movieviewrenderer.h \ qt7movievideowidget.h |