diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 22:50:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 22:50:33 (GMT) |
| commit | ccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb (patch) | |
| tree | 691250169f111cad7b0d3061796f37bb364c8b70 /src/multimedia/qml/qml.pri | |
| parent | af4f30abb88d242d1e310914b53bc91b24e45a59 (diff) | |
| parent | 91ed4f664008577a095f5554372456661865dede (diff) | |
| download | Qt-ccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb.zip Qt-ccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb.tar.gz Qt-ccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Remove active qDebugs.
Player demo updated with more user-friendly previous button behaviour.
Added QNetworkRequest constructor to QMediaContent.
Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
Add private header warning.
Diffstat (limited to 'src/multimedia/qml/qml.pri')
| -rw-r--r-- | src/multimedia/qml/qml.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/qml/qml.pri b/src/multimedia/qml/qml.pri index e506632..a7ca02e 100644 --- a/src/multimedia/qml/qml.pri +++ b/src/multimedia/qml/qml.pri @@ -17,7 +17,7 @@ contains(QT_CONFIG, declarative) { } HEADERS += \ - $$PWD/qml.h \ + $$PWD/multimediaqml.h \ $$PWD/qmetadatacontrolmetaobject_p.h \ $$PWD/qmlaudio_p.h \ $$PWD/qmlgraphicsvideo_p.h \ @@ -26,7 +26,7 @@ contains(QT_CONFIG, declarative) { $$PWD/wavedecoder_p.h SOURCES += \ - $$PWD/qml.cpp \ + $$PWD/multimediaqml.cpp \ $$PWD/qmetadatacontrolmetaobject.cpp \ $$PWD/qmlaudio.cpp \ $$PWD/qmlgraphicsvideo.cpp \ |