diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-18 23:44:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-18 23:44:37 (GMT) |
| commit | fdb5a0fe7a465c0d193260eea94f7caf36263265 (patch) | |
| tree | fdaf580979cf8df59ec691bc048f48c54efb716f /mkspecs | |
| parent | a584ce0be29e9cb5cb0b627c71e4147011013418 (diff) | |
| parent | 348917e291077ae7760e3621eecee9753245ca9b (diff) | |
| download | Qt-fdb5a0fe7a465c0d193260eea94f7caf36263265.zip Qt-fdb5a0fe7a465c0d193260eea94f7caf36263265.tar.gz Qt-fdb5a0fe7a465c0d193260eea94f7caf36263265.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Three fixes from Shane after QtMultimedia was split into two dlls.
Fix compile errors in Direct Show media service.
Add EXPORT defines for QtMediaServices library.
Fixed configure check for gstreamer.
WebKit; build with change to mediaservices.
QtMediaservices -> QtMediaServices.
configure; Fixes for changes to use mediaservices.
Fixed compile errors in pulseaudio backend for soundeffect
Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d
Fixed compile errors with gstreamer plugin
Create Mediaservices lib, separate from Multimedia.
Gstreamer media backend: seek to media start on end of stream.
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 62cce62..7b0b4af 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -36,7 +36,7 @@ INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picki win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt # As order does matter for static libs, we reorder the QT variable here -TMPLIBS = declarative webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core +TMPLIBS = declarative webkit phonon mediaservices multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core for(QTLIB, $$list($$TMPLIBS)) { contains(QT, $$QTLIB): QT_ORDERED += $$QTLIB } @@ -175,6 +175,7 @@ for(QTLIB, $$list($$lower($$unique(QT)))) { } } else:isEqual(QTLIB, declarative):qlib = QtDeclarative else:isEqual(QTLIB, multimedia):qlib = QtMultimedia + else:isEqual(QTLIB, mediaservices):qlib = QtMediaServices else:message("Unknown QT: $$QTLIB"):qlib = !isEmpty(qlib) { target_qt:isEqual(TARGET, qlib) { |