diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2009-08-05 04:26:56 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2009-08-05 04:26:56 (GMT) |
| commit | e7052de274f6a201be628441d144dbbef5868948 (patch) | |
| tree | 2456ce91e33a13d49666213e722a12f32d196e0a /mkspecs/features | |
| parent | bd51c3010e78925a2074122b281de53f01be9ef9 (diff) | |
| download | Qt-e7052de274f6a201be628441d144dbbef5868948.zip Qt-e7052de274f6a201be628441d144dbbef5868948.tar.gz Qt-e7052de274f6a201be628441d144dbbef5868948.tar.bz2 | |
Merge AudioServices into mainline.
Diffstat (limited to 'mkspecs/features')
| -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 1bac953..a03a313 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 = webkit phonon dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core +TMPLIBS = multimedia webkit phonon 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 } @@ -152,6 +152,7 @@ for(QTLIB, $$list($$lower($$unique(QT)))) { else:isEqual(QTLIB, dbus):qlib = QtDBus else:isEqual(QTLIB, phonon):qlib = phonon else:isEqual(QTLIB, webkit):qlib = QtWebKit + else:isEqual(QTLIB, multimedia):qlib = QtMultimedia else:message("Unknown QT: $$QTLIB"):qlib = !isEmpty(qlib) { target_qt:isEqual(TARGET, qlib) { |