Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Use feature profile loading instead of direct inclusion.
This commit is contained in:
Qt Continuous Integration System
2011-06-07 20:44:00 +10:00

View File

@@ -11,7 +11,7 @@ DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE
unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
include($$QT_SOURCE_TREE/src/qbase.pri)
load(qt_module_config)
HEADERS += qtmultimediaversion.h