diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-22 23:54:51 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-22 23:54:51 (GMT) |
| commit | 478e914638f2131d1547c4e2dc4659723657194d (patch) | |
| tree | c9f63e6bd79dce411ae059b1bb65a66db6584264 /demos/multimedia | |
| parent | 6b30ee9d2219308605e0d1b15ea1c74dc5cb67fe (diff) | |
| parent | 4894e6dd57c31e0196c6fdae4d1b2fb16b9f1b16 (diff) | |
| download | Qt-478e914638f2131d1547c4e2dc4659723657194d.zip Qt-478e914638f2131d1547c4e2dc4659723657194d.tar.gz Qt-478e914638f2131d1547c4e2dc4659723657194d.tar.bz2 | |
Merge branch '4.7' of ../../qt/4.7 into 4.7
Conflicts:
demos/multimedia/player/player.pro
Diffstat (limited to 'demos/multimedia')
| -rw-r--r-- | demos/multimedia/player/player.pro | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/demos/multimedia/player/player.pro b/demos/multimedia/player/player.pro index fb93416..0b868bd 100644 --- a/demos/multimedia/player/player.pro +++ b/demos/multimedia/player/player.pro @@ -3,7 +3,6 @@ TARGET = player QT += gui mediaservices - HEADERS = \ player.h \ playercontrols.h \ @@ -18,5 +17,12 @@ SOURCES = \ videowidget.cpp target.path = $$[QT_INSTALL_DEMOS]/multimedia/player -INSTALLS += target +sources.files = $$SOURCES $$HEADERS *.pro +sources.path = $$[QT_INSTALL_DEMOS]/multimedia/player + +INSTALLS += target sources + +symbian { + TARGET.UID3 = 0xA000E3FA +} |