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 | |
| 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')
| -rw-r--r-- | demos/embedded/fluidlauncher/fluidlauncher.pro | 3 | ||||
| -rw-r--r-- | demos/multimedia/player/player.pro | 10 | ||||
| -rw-r--r-- | demos/qmediaplayer/qmediaplayer.pro | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro index 13274c3..c6a105e 100644 --- a/demos/embedded/fluidlauncher/fluidlauncher.pro +++ b/demos/embedded/fluidlauncher/fluidlauncher.pro @@ -57,9 +57,10 @@ wince*{ symbian { load(data_caging_paths) + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + RSS_RULES = # Clear RSS_RULES, otherwise fluidlauncher will get put into QtDemos folder TARGET.UID3 = 0xA000A641 - ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg defineReplace(regResourceDir) { symbian-abld|symbian-sbsv2 { 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 +} diff --git a/demos/qmediaplayer/qmediaplayer.pro b/demos/qmediaplayer/qmediaplayer.pro index 9407a81..cfe3905 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 qmediaplayer.pro INSTALLS += target sources wince*{ |