Merge commit 'origin/4.6' into mmfphonon

Conflicts:
	demos/mediaplayer/mediaplayer.pro

17 files changed, 49 insertions, 19 deletions

diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro
index 407030f24d..dab93871bf 100644
--- a/demos/browser/browser.pro
+++ b/demos/browser/browser.pro
@@ -93,6 +93,6 @@ sources.path = $$[QT_INSTALL_DEMOS]/browser
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF70
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 }
diff --git a/demos/deform/deform.pro b/demos/deform/deform.pro
index 4cce195d7d..421432d21e 100644
--- a/demos/deform/deform.pro
+++ b/demos/deform/deform.pro
@@ -19,6 +19,6 @@ sources.path = $$[QT_INSTALL_DEMOS]/deform
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A63D
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 }
diff --git a/demos/embedded/anomaly/anomaly.pro b/demos/embedded/anomaly/anomaly.pro
index f7c11b6ce6..06d73fa730 100644
--- a/demos/embedded/anomaly/anomaly.pro
+++ b/demos/embedded/anomaly/anomaly.pro
@@ -22,10 +22,10 @@ SOURCES += src/Main.cpp \
 RESOURCES += src/anomaly.qrc
 
 symbian {
+    TARGET.UID3 = 0xA000CF71
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
     LIBS += -lesock -linsock -lconnmon
     TARGET.CAPABILITY = NetworkServices
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-    TARGET.UID3 = 0xA000CF71
 }
diff --git a/demos/embedded/desktopservices/desktopservices.pro b/demos/embedded/desktopservices/desktopservices.pro
index 81fe16dbb4..c160029c8a 100644
--- a/demos/embedded/desktopservices/desktopservices.pro
+++ b/demos/embedded/desktopservices/desktopservices.pro
@@ -16,7 +16,7 @@ image.path = /data/images/
 DEPLOYMENT += music image
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C611
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     ICON = ./resources/heart.svg
 }
diff --git a/demos/embedded/digiflip/digiflip.pro b/demos/embedded/digiflip/digiflip.pro
index 4db5171584..72cdc0fbc1 100644
--- a/demos/embedded/digiflip/digiflip.pro
+++ b/demos/embedded/digiflip/digiflip.pro
@@ -1,7 +1,7 @@
 SOURCES = digiflip.cpp
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF72
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 }
 
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
index 9401871882..209ec1a783 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
@@ -16,6 +16,6 @@ wince* {
 }
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A640
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 }
diff --git a/demos/embedded/flickable/flickable.pro b/demos/embedded/flickable/flickable.pro
index 02e88aa614..731dcbe177 100644
--- a/demos/embedded/flickable/flickable.pro
+++ b/demos/embedded/flickable/flickable.pro
@@ -2,6 +2,6 @@ SOURCES = flickable.cpp main.cpp
 HEADERS = flickable.h
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF73
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 }
diff --git a/demos/embedded/flightinfo/flightinfo.pro b/demos/embedded/flightinfo/flightinfo.pro
index 2f36cb812a..5659fa2ebf 100644
--- a/demos/embedded/flightinfo/flightinfo.pro
+++ b/demos/embedded/flightinfo/flightinfo.pro
@@ -6,8 +6,8 @@ RESOURCES = flightinfo.qrc
 QT += network
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF74
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
     LIBS += -lesock  -lconnmon -linsock
     TARGET.CAPABILITY = NetworkServices
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index af01ee7fe9..d677e9dc13 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -59,6 +59,7 @@ symbian {
     load(data_caging_paths)
 
     TARGET.UID3 = 0xA000A641
+    ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
 
     executables.sources = \
         styledemo.exe \
@@ -123,6 +124,25 @@ symbian {
     
     resource.path = $$APP_RESOURCE_DIR
 
+    mifs.sources = \
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000A641.mif \ #fluidlauncher
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000A63F.mif \ #styledemo
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000A63D.mif \ #deform
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000A63E.mif \ #pathstroke
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C607.mif \ #wiggly
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000A648.mif \ #ftp
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C60A.mif \ #saxbookmarks
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C611.mif \ #desktopservices
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C610.mif \ #fridgemagnets
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C612.mif \ #drilldown
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000CF6B.mif \ #softkeys
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000CF76.mif \ #raycasting
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000CF73.mif \ #flickable
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000CF72.mif \ #digiflip
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000CF75.mif \ #lightmaps
+        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000CF74.mif   #flightinfo
+    mifs.path = $$APP_RESOURCE_DIR
+
     contains(QT_CONFIG, svg) { 
         executables.sources += \ 
             embeddedsvgviewer.exe \
@@ -135,28 +155,35 @@ symbian {
         resource.sources += \
             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.rsc \
             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/weatherinfo.rsc
+
+        mifs.sources += \
+            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000A640.mif \ #embeddedsvgviewer
+            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000CF77.mif   #weatherinfo
+
     }
     contains(QT_CONFIG, webkit) {
         executables.sources += anomaly.exe
         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
+        mifs.sources += \
+            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000CF71.mif   #anomaly
     }
 
     contains(QT_CONFIG, phonon) {
         executables.sources += qmediaplayer.exe
         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.rsc
+        mifs.sources += \
+            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C613.mif   #qmediaplayer
     }
 
     contains(QT_CONFIG, script) {
         executables.sources += context2d.exe    
         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/context2d_reg.rsc
         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.rsc
+        mifs.sources += \
+            $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C608.mif   #context2d
     }
 
-    mifs.sources = \
-        $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/0xA000C611.mif
-    mifs.path = $$APP_RESOURCE_DIR
-
     files.sources = $$PWD/screenshots $$PWD/slides
     files.path = .
 
diff --git a/demos/embedded/lightmaps/lightmaps.pro b/demos/embedded/lightmaps/lightmaps.pro
index d4168b1d7a..122865e1c8 100644
--- a/demos/embedded/lightmaps/lightmaps.pro
+++ b/demos/embedded/lightmaps/lightmaps.pro
@@ -3,8 +3,8 @@ SOURCES = lightmaps.cpp
 QT += network
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF75
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
     LIBS += -lesock  -lconnmon -linsock
     TARGET.CAPABILITY = NetworkServices
diff --git a/demos/embedded/raycasting/raycasting.pro b/demos/embedded/raycasting/raycasting.pro
index 19e02123eb..8dd8a247a7 100644
--- a/demos/embedded/raycasting/raycasting.pro
+++ b/demos/embedded/raycasting/raycasting.pro
@@ -3,6 +3,6 @@ SOURCES = raycasting.cpp
 RESOURCES += raycasting.qrc
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF76
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 }
diff --git a/demos/embedded/styledemo/styledemo.pro b/demos/embedded/styledemo/styledemo.pro
index 7107798e2a..2125f3b1b1 100644
--- a/demos/embedded/styledemo/styledemo.pro
+++ b/demos/embedded/styledemo/styledemo.pro
@@ -12,6 +12,6 @@ sources.path = $$[QT_INSTALL_DEMOS]/embedded/styledemo
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A63F
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 }
diff --git a/demos/embedded/weatherinfo/weatherinfo.pro b/demos/embedded/weatherinfo/weatherinfo.pro
index 7bff6e9569..5b2f03a35c 100644
--- a/demos/embedded/weatherinfo/weatherinfo.pro
+++ b/demos/embedded/weatherinfo/weatherinfo.pro
@@ -5,8 +5,8 @@ RESOURCES = weatherinfo.qrc
 QT += network svg
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF77
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
     LIBS += -lesock -lconnmon -linsock
     TARGET.CAPABILITY = NetworkServices
diff --git a/demos/mediaplayer/mediaplayer.pro b/demos/mediaplayer/mediaplayer.pro
index bf61aaed2d..84293f2e55 100644
--- a/demos/mediaplayer/mediaplayer.pro
+++ b/demos/mediaplayer/mediaplayer.pro
@@ -26,11 +26,12 @@ DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout
 }
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C613
 
      addFiles.sources = ../../tests/auto/mediaobject/media/sax.mp3
 
      addFiles.path = /data/sounds/
      DEPLOYMENT += addFiles
+
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 }
diff --git a/demos/pathstroke/pathstroke.pro b/demos/pathstroke/pathstroke.pro
index ac50842405..43f20b6813 100644
--- a/demos/pathstroke/pathstroke.pro
+++ b/demos/pathstroke/pathstroke.pro
@@ -19,6 +19,6 @@ sources.path = $$[QT_INSTALL_DEMOS]/pathstroke
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A63E
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 }
diff --git a/demos/shared/shared.pro b/demos/shared/shared.pro
index de29857f15..0f7137feaa 100644
--- a/demos/shared/shared.pro
+++ b/demos/shared/shared.pro
@@ -33,6 +33,6 @@ INSTALLS += sources
 !cross_compile:INSTALLS += target
 
 symbian {
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A63C
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 }
diff --git a/demos/symbianpkgrules.pri b/demos/symbianpkgrules.pri
index 7e6852bd46..cf52cb31ff 100644
--- a/demos/symbianpkgrules.pri
+++ b/demos/symbianpkgrules.pri
@@ -11,3 +11,5 @@ vendorinfo = \
     " "
 
 default_deployment.pkg_prerules += vendorinfo
+
+!isEmpty(TARGET.UID3):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg