summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-04-15 09:08:00 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-04-15 09:08:00 (GMT)
commite85223d233c0e1d6beca748332b8fbaba3ebbf2d (patch)
tree3f6b3df4e7255403ed1b26413240ea7008bf5883 /mkspecs/features
parent29bb0a4f0fc135337658e5fa273edb06eefaae3d (diff)
downloadQt-e85223d233c0e1d6beca748332b8fbaba3ebbf2d.zip
Qt-e85223d233c0e1d6beca748332b8fbaba3ebbf2d.tar.gz
Qt-e85223d233c0e1d6beca748332b8fbaba3ebbf2d.tar.bz2
Create Mediaservices lib, separate from Multimedia.
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/qt.prf3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 62cce62..ff4e986 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) {