Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Enable building with MSVC2008
  Added mention of Symbian binary packages to INSTALL file
  Fix for QTBUG-5870 QGraphicsProxyWidget does not show children on
  Deploy sqlite3.sis instead of sqlite3.dll in Symbian
  Separated "make run" and "make runonphone" targets
  Added UIDs and icons to some webkit examples
  Implemented node disconnection in Phonon MMF backend
  Removed dead code from Phonon MMF backend
  Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark.
  Implemented support for playlist handling in Phonon MMF backend
  Mediaplayer: enqueue all entries from .ram file before starting playback
  Changed call sequence of seeking in Phonon MMF backend, for streaming
  Implemented buffer status notifications in Phonon MMF backend
  Added support for streaming playback to Phonon MMF backend
  Phonon MMF: leaves during object construction throw exceptions
  Removed stale TODO comments from Phonon MMF backend
  Symbian: More i18n strings work.
  Fixed bug which caused Phonon backend error messages to be suppressed
  Added error strings to Phonon MMF backend

4 files changed, 18 insertions, 2 deletions

diff --git a/examples/webkit/domtraversal/domtraversal.pro b/examples/webkit/domtraversal/domtraversal.pro
index 49400de..ba5f2d8 100644
--- a/examples/webkit/domtraversal/domtraversal.pro
+++ b/examples/webkit/domtraversal/domtraversal.pro
@@ -9,3 +9,8 @@ target.path = $$[QT_INSTALL_EXAMPLES]/webkit/domtraversal
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/domtraversal
 INSTALLS += target sources
+
+symbian {
+    TARGET.UID3 = 0xA000D7CB
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}
diff --git a/examples/webkit/fancybrowser/fancybrowser.pro b/examples/webkit/fancybrowser/fancybrowser.pro
index e496241..3786d9c 100644
--- a/examples/webkit/fancybrowser/fancybrowser.pro
+++ b/examples/webkit/fancybrowser/fancybrowser.pro
@@ -10,4 +10,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/fancybrowser
 INSTALLS += target sources
 
-symbian:TARGET.UID3 = 0xA000CF6C
+symbian {
+    TARGET.UID3 = 0xA000CF6C
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}
diff --git a/examples/webkit/googlechat/googlechat.pro b/examples/webkit/googlechat/googlechat.pro
index 8e4f9a6..3d32c1b 100644
--- a/examples/webkit/googlechat/googlechat.pro
+++ b/examples/webkit/googlechat/googlechat.pro
@@ -10,4 +10,7 @@ sources.files = $$SOURCES $$HEADERS $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlechat
 INSTALLS += target sources
 
-symbian:TARGET.UID3 = 0xA000CF6E
+symbian {
+    TARGET.UID3 = 0xA000CF6E
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}
diff --git a/examples/webkit/simpleselector/simpleselector.pro b/examples/webkit/simpleselector/simpleselector.pro
index 3f3037f..acd0ae7 100644
--- a/examples/webkit/simpleselector/simpleselector.pro
+++ b/examples/webkit/simpleselector/simpleselector.pro
@@ -9,3 +9,8 @@ target.path = $$[QT_INSTALL_EXAMPLES]/webkit/simpleselector
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/simpleselector
 INSTALLS += target sources
+
+symbian {
+    TARGET.UID3 = 0xA000D7CC
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}