diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-23 12:35:06 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-23 12:45:24 (GMT) |
| commit | 0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b (patch) | |
| tree | 6e42bb138fb9d1c6d69000f385905369f8ca6206 /mkspecs | |
| parent | bbcef4e4b596324aeda80e0aa7d313c586454740 (diff) | |
| download | Qt-0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b.zip Qt-0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b.tar.gz Qt-0cb5038a3e5d3a6b0c33d081b89c6fe47cfc0b1b.tar.bz2 | |
Try to support Qt 4.4-style Phonon includes in Qt.
This introduces an undocumented "phonon_compat" subdir and also adds
it to the INCLUDEPATH when QT += phonon is specified. With this, these
styles of #includes should be supported:
#include <Phonon>
#include <Phonon/Phonon>
#include <phonon>
#include <phonon/phonon>
#include <Phonon/MediaObject>
#include <phonon/mediaobject.h>
Still need to check if the headers get installed during "make
install". I couldn't find where in our code that is done.
BT: yes
Reviewed-By: Trust Me
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index b3d6a5f..2b2a42c 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -158,8 +158,12 @@ for(QTLIB, $$list($$lower($$unique(QT)))) { else:isEqual(QTLIB, scripttools):qlib = QtScriptTools else:isEqual(QTLIB, testlib):qlib = QtTest else:isEqual(QTLIB, dbus):qlib = QtDBus - else:isEqual(QTLIB, phonon):qlib = phonon - else:isEqual(QTLIB, webkit):qlib = QtWebKit + else:isEqual(QTLIB, phonon) { + qlib = phonon + INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat/phonon + INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat + INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon/Phonon + } else:isEqual(QTLIB, webkit):qlib = QtWebKit else:isEqual(QTLIB, multimedia):qlib = QtMultimedia else:message("Unknown QT: $$QTLIB"):qlib = !isEmpty(qlib) { |