diff options
| author | Frans Englich <frans.englich@nokia.com> | 2010-04-21 13:11:54 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2010-04-21 13:35:22 (GMT) |
| commit | 25b7ad303643ecc065f33d49120bc7b9fd618b8b (patch) | |
| tree | 7dcd06698fcaded6577ab5c9d41361b8acc144ba | |
| parent | 8d4569aaa33bbfdc92d2d1eca2880033db2fef6b (diff) | |
| download | Qt-25b7ad303643ecc065f33d49120bc7b9fd618b8b.zip Qt-25b7ad303643ecc065f33d49120bc7b9fd618b8b.tar.gz Qt-25b7ad303643ecc065f33d49120bc7b9fd618b8b.tar.bz2 | |
Assign UID3, install example files, remove redundant code.
This demo still needs work on Symbian, related is QTBUG-10095.
Reviewed-by: Jason Barron
| -rw-r--r-- | demos/multimedia/player/player.pro | 15 | ||||
| -rw-r--r-- | demos/qmediaplayer/qmediaplayer.pro | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/demos/multimedia/player/player.pro b/demos/multimedia/player/player.pro index dc731e4..922de1b 100644 --- a/demos/multimedia/player/player.pro +++ b/demos/multimedia/player/player.pro @@ -1,8 +1,5 @@ -TEMPLATE = app -TARGET = player - -QT += gui multimedia +QT += multimedia HEADERS = \ player.h \ @@ -18,5 +15,13 @@ SOURCES = \ videowidget.cpp target.path = $$[QT_INSTALL_DEMOS]/multimedia/player -INSTALLS += target + +sources.files = $$SOURCES $$HEADERS +sources.path = $$[QT_INSTALL_DEMOS]/multimedia/player + +INSTALLS += target sources + +symbian { + TARGET.UID3 = 0xA000E3FA +} diff --git a/demos/qmediaplayer/qmediaplayer.pro b/demos/qmediaplayer/qmediaplayer.pro index 9407a81..b9e58b4 100644 --- a/demos/qmediaplayer/qmediaplayer.pro +++ b/demos/qmediaplayer/qmediaplayer.pro @@ -17,7 +17,7 @@ HEADERS += mediaplayer.h target.path = $$[QT_INSTALL_DEMOS]/qmediaplayer sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_DEMOS]/qmediaplayer +sources.path = $$[QT_INSTALL_DEMOS]/qmediaplayer phonon.pro INSTALLS += target sources wince*{ |