diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 01:28:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 01:28:00 (GMT) |
| commit | 7bb199ede885a6f1fe152d93aeef222d742f30fa (patch) | |
| tree | 9b3d515470f306e523882457a9d5dcceee876b6b /demos | |
| parent | a17339e943f21bb6c6e16884f716dd9ab8f94938 (diff) | |
| parent | 741d42e28032e5e6f29834c2aacbf65262df7ded (diff) | |
| download | Qt-7bb199ede885a6f1fe152d93aeef222d742f30fa.zip Qt-7bb199ede885a6f1fe152d93aeef222d742f30fa.tar.gz Qt-7bb199ede885a6f1fe152d93aeef222d742f30fa.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:
Fix qdoc error in low-level audio
When deployed on symbian, give player application the standard QT icon
update multimedia qml element doc samples
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/multimedia/player/player.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demos/multimedia/player/player.pro b/demos/multimedia/player/player.pro index 0b868bd..12bdf64 100644 --- a/demos/multimedia/player/player.pro +++ b/demos/multimedia/player/player.pro @@ -24,5 +24,6 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000E3FA + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) } |