Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

52 files changed, 73 insertions, 59 deletions

diff --git a/examples/declarative/border-image/colors-round.sci b/examples/declarative/border-image/colors-round.sci
index 3784e10..506f6f5 100644
--- a/examples/declarative/border-image/colors-round.sci
+++ b/examples/declarative/border-image/colors-round.sci
@@ -1,7 +1,7 @@
-gridLeft:30
-gridTop:30
-gridRight:30
-gridBottom:30
+border.left:30
+border.top:30
+border.right:30
+border.bottom:30
 horizontalTileRule:Round
 verticalTileRule:Round
-imageFile:colors.png
+source:colors.png
diff --git a/examples/declarative/border-image/colors-stretch.sci b/examples/declarative/border-image/colors-stretch.sci
index c693599..e4989a7 100644
--- a/examples/declarative/border-image/colors-stretch.sci
+++ b/examples/declarative/border-image/colors-stretch.sci
@@ -1,5 +1,5 @@
-gridLeft:30
-gridTop:30
-gridRight:30
-gridBottom:30
-imageFile:colors.png
+border.left:30
+border.top:30
+border.right:30
+border.bottom:30
+source:colors.png
diff --git a/examples/draganddrop/draggableicons/draggableicons.pro b/examples/draganddrop/draggableicons/draggableicons.pro
index f177bd6..9def1bc 100644
--- a/examples/draganddrop/draggableicons/draggableicons.pro
+++ b/examples/draganddrop/draggableicons/draggableicons.pro
@@ -10,6 +10,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/draggableicons
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C615
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/draganddrop/draggabletext/draggabletext.pro b/examples/draganddrop/draggabletext/draggabletext.pro
index 19fee2d..7c2cfbb 100644
--- a/examples/draganddrop/draggabletext/draggabletext.pro
+++ b/examples/draganddrop/draggabletext/draggabletext.pro
@@ -12,6 +12,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/draggabletext
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF64
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/draganddrop/fridgemagnets/fridgemagnets.pro b/examples/draganddrop/fridgemagnets/fridgemagnets.pro
index b8388cf..ea40a74 100644
--- a/examples/draganddrop/fridgemagnets/fridgemagnets.pro
+++ b/examples/draganddrop/fridgemagnets/fridgemagnets.pro
@@ -12,8 +12,8 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/fridgemagnets
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C610
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
 
 
diff --git a/examples/draganddrop/puzzle/puzzle.pro b/examples/draganddrop/puzzle/puzzle.pro
index 20080e9..31786c7 100644
--- a/examples/draganddrop/puzzle/puzzle.pro
+++ b/examples/draganddrop/puzzle/puzzle.pro
@@ -14,11 +14,11 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/puzzle
 INSTALLS += target sources
 
 symbian:{
+   TARGET.UID3 = 0xA000CF65
    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
    addFile.sources = example.jpg
    addFile.path = .
    DEPLOYMENT += addFile
-   TARGET.UID3 = 0xA000CF65
 }
 wince*: {
    addFile.sources = example.jpg
diff --git a/examples/gestures/imageviewer/imagewidget.cpp b/examples/gestures/imageviewer/imagewidget.cpp
index 2be6cc5..3489b5b 100644
--- a/examples/gestures/imageviewer/imagewidget.cpp
+++ b/examples/gestures/imageviewer/imagewidget.cpp
@@ -145,7 +145,7 @@ void ImageWidget::swipeTriggered()
         goNextImage();
     update();
 }
-//! [swipe slot finish]
+//! [swipe slot start]
 
 void ImageWidget::resizeEvent(QResizeEvent*)
 {
diff --git a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
index 8a6aae1..9549174 100644
--- a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
+++ b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
@@ -12,6 +12,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/basicgraphicslayouts
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A645
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/graphicsview/collidingmice/collidingmice.pro b/examples/graphicsview/collidingmice/collidingmice.pro
index e4dc117..207c645 100644
--- a/examples/graphicsview/collidingmice/collidingmice.pro
+++ b/examples/graphicsview/collidingmice/collidingmice.pro
@@ -14,6 +14,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/collidingmice
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A643
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/graphicsview/elasticnodes/elasticnodes.pro b/examples/graphicsview/elasticnodes/elasticnodes.pro
index ba17386..c086461 100644
--- a/examples/graphicsview/elasticnodes/elasticnodes.pro
+++ b/examples/graphicsview/elasticnodes/elasticnodes.pro
@@ -18,6 +18,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/elasticnodes
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A642
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/graphicsview/padnavigator/padnavigator.pro b/examples/graphicsview/padnavigator/padnavigator.pro
index cb09b90..d6f536c 100644
--- a/examples/graphicsview/padnavigator/padnavigator.pro
+++ b/examples/graphicsview/padnavigator/padnavigator.pro
@@ -26,6 +26,6 @@ INSTALLS += target sources
 CONFIG += console
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A644
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/itemviews/addressbook/addressbook.pro b/examples/itemviews/addressbook/addressbook.pro
index b53a1cf..f45f92c 100644
--- a/examples/itemviews/addressbook/addressbook.pro
+++ b/examples/itemviews/addressbook/addressbook.pro
@@ -17,6 +17,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/addressbook
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A646
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro
index 8568181..53601f4 100644
--- a/examples/itemviews/chart/chart.pro
+++ b/examples/itemviews/chart/chart.pro
@@ -15,6 +15,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/chart
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A647
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/mainwindows/menus/menus.pro b/examples/mainwindows/menus/menus.pro
index 5ac5b34..7ca442e 100644
--- a/examples/mainwindows/menus/menus.pro
+++ b/examples/mainwindows/menus/menus.pro
@@ -9,6 +9,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/mainwindows/menus
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF66
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/multimedia/audio/audiodevices/audiodevices.pro b/examples/multimedia/audio/audiodevices/audiodevices.pro
index 2c078ba..173aa8f 100644
--- a/examples/multimedia/audio/audiodevices/audiodevices.pro
+++ b/examples/multimedia/audio/audiodevices/audiodevices.pro
@@ -12,6 +12,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiodevices
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000D7BE
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/multimedia/audio/audioinput/audioinput.pro b/examples/multimedia/audio/audioinput/audioinput.pro
index 139240e..0d6198d 100644
--- a/examples/multimedia/audio/audioinput/audioinput.pro
+++ b/examples/multimedia/audio/audioinput/audioinput.pro
@@ -11,6 +11,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audioinput
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000D7BF
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/multimedia/audio/audiooutput/audiooutput.pro b/examples/multimedia/audio/audiooutput/audiooutput.pro
index e2069cf..b43763c 100644
--- a/examples/multimedia/audio/audiooutput/audiooutput.pro
+++ b/examples/multimedia/audio/audiooutput/audiooutput.pro
@@ -11,6 +11,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiooutput
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000D7C0
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro
index 0a132a5..803c2f2 100644
--- a/examples/network/fortuneserver/fortuneserver.pro
+++ b/examples/network/fortuneserver/fortuneserver.pro
@@ -10,10 +10,10 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneserver
 INSTALLS += target sources
 
 symbian {
+    TARGET.UID3 = 0xA000CF71
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/ftp/sym_iap_util.h
     LIBS += -lesock
-    TARGET.UID3 = 0xA000CF71
     TARGET.CAPABILITY = "All -TCB"
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }
diff --git a/examples/network/ftp/ftp.pro b/examples/network/ftp/ftp.pro
index 73eb716..ce2a97b 100644
--- a/examples/network/ftp/ftp.pro
+++ b/examples/network/ftp/ftp.pro
@@ -11,10 +11,10 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/network/ftp
 INSTALLS += target sources
 
 symbian {
+    TARGET.UID3 = 0xA000A648
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     HEADERS +=  sym_iap_util.h
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
     TARGET.CAPABILITY="NetworkServices ReadUserData WriteUserData"
-    TARGET.UID3 = 0xA000A648
     LIBS+=-lesock -lcommdb -linsock # For IAP selection
 }
diff --git a/examples/network/securesocketclient/securesocketclient.pro b/examples/network/securesocketclient/securesocketclient.pro
index 48c8e0d..ff4f4587 100644
--- a/examples/network/securesocketclient/securesocketclient.pro
+++ b/examples/network/securesocketclient/securesocketclient.pro
@@ -16,6 +16,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/network/securesocketclient
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF67
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/painting/basicdrawing/basicdrawing.pro b/examples/painting/basicdrawing/basicdrawing.pro
index ea23706..4fa0e71 100644
--- a/examples/painting/basicdrawing/basicdrawing.pro
+++ b/examples/painting/basicdrawing/basicdrawing.pro
@@ -12,6 +12,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/painting/basicdrawing
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A649
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/painting/concentriccircles/concentriccircles.pro b/examples/painting/concentriccircles/concentriccircles.pro
index a8d2c36..0ef4337 100644
--- a/examples/painting/concentriccircles/concentriccircles.pro
+++ b/examples/painting/concentriccircles/concentriccircles.pro
@@ -11,6 +11,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/painting/concentriccircles
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A64A
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/painting/imagecomposition/imagecomposition.pro b/examples/painting/imagecomposition/imagecomposition.pro
index fe29a8a..e9e8725 100644
--- a/examples/painting/imagecomposition/imagecomposition.pro
+++ b/examples/painting/imagecomposition/imagecomposition.pro
@@ -10,6 +10,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/painting/imagecomposition
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A64B
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro
index 1d981bb..1f42b41 100644
--- a/examples/painting/painterpaths/painterpaths.pro
+++ b/examples/painting/painterpaths/painterpaths.pro
@@ -12,6 +12,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A64C
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/painting/svgviewer/svgviewer.pro b/examples/painting/svgviewer/svgviewer.pro
index 583d51c..5af8731 100644
--- a/examples/painting/svgviewer/svgviewer.pro
+++ b/examples/painting/svgviewer/svgviewer.pro
@@ -23,8 +23,8 @@ wince*: {
 }
 
 symbian: {
-     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
      TARGET.UID3 = 0xA000A64E
+     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
      addFiles.sources = files\*.svg
      addFiles.path = .
      DEPLOYMENT += addFiles
diff --git a/examples/painting/transformations/transformations.pro b/examples/painting/transformations/transformations.pro
index 9e225a4..91470f7 100644
--- a/examples/painting/transformations/transformations.pro
+++ b/examples/painting/transformations/transformations.pro
@@ -11,6 +11,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/painting/transformations
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A64D
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/qtestlib/tutorial1/tutorial1.pro b/examples/qtestlib/tutorial1/tutorial1.pro
index bcce234..93b0ec6 100644
--- a/examples/qtestlib/tutorial1/tutorial1.pro
+++ b/examples/qtestlib/tutorial1/tutorial1.pro
@@ -8,6 +8,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial1
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C60B
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/qtestlib/tutorial2/tutorial2.pro b/examples/qtestlib/tutorial2/tutorial2.pro
index bcfe940..eb79038 100644
--- a/examples/qtestlib/tutorial2/tutorial2.pro
+++ b/examples/qtestlib/tutorial2/tutorial2.pro
@@ -8,6 +8,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial2
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C60C
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/qtestlib/tutorial3/tutorial3.pro b/examples/qtestlib/tutorial3/tutorial3.pro
index fed5064..603afd1 100644
--- a/examples/qtestlib/tutorial3/tutorial3.pro
+++ b/examples/qtestlib/tutorial3/tutorial3.pro
@@ -8,6 +8,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial3
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C60D
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/qtestlib/tutorial4/tutorial4.pro b/examples/qtestlib/tutorial4/tutorial4.pro
index 00c2147..8695849 100644
--- a/examples/qtestlib/tutorial4/tutorial4.pro
+++ b/examples/qtestlib/tutorial4/tutorial4.pro
@@ -8,6 +8,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial4
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C60E
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/qtestlib/tutorial5/tutorial5.pro b/examples/qtestlib/tutorial5/tutorial5.pro
index 4fdcec9..7f5e695 100644
--- a/examples/qtestlib/tutorial5/tutorial5.pro
+++ b/examples/qtestlib/tutorial5/tutorial5.pro
@@ -8,6 +8,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial5
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C60F
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro
index 301c227..54f5c31 100644
--- a/examples/script/context2d/context2d.pro
+++ b/examples/script/context2d/context2d.pro
@@ -23,8 +23,8 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/script/context2d
 INSTALLS += target sources
 
 symbian:{
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C608
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.EPOCHEAPSIZE = 0x200000 0xA00000
     contextScripts.path = .
     contextScripts.sources = scripts
diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp
index 2f195c9..2c3c623 100644
--- a/examples/script/context2d/main.cpp
+++ b/examples/script/context2d/main.cpp
@@ -46,8 +46,19 @@ int main(int argc, char **argv)
 {
     Q_INIT_RESOURCE(context2d);
 
+    bool smallScreen = false;
+    for (int i = 0; i < argc; i++)
+        if (QString(argv[i]) == "-small-screen")
+            smallScreen = true;
+
     QApplication app(argc, argv);
     Window win;
-    win.show();
+
+    if (!smallScreen) {
+        win.show();
+    } else {
+        win.showFullScreen();
+    }
+
     return app.exec();
 }
diff --git a/examples/sql/drilldown/drilldown.pro b/examples/sql/drilldown/drilldown.pro
index b6de511..5c97e88 100644
--- a/examples/sql/drilldown/drilldown.pro
+++ b/examples/sql/drilldown/drilldown.pro
@@ -16,6 +16,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/sql/drilldown
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C612
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/statemachine/rogue/movementtransition.h b/examples/statemachine/rogue/movementtransition.h
index b919360..3452155 100644
--- a/examples/statemachine/rogue/movementtransition.h
+++ b/examples/statemachine/rogue/movementtransition.h
@@ -61,7 +61,7 @@ public:
 //![1]
 protected:
     bool eventTest(QEvent *event) {
-        if (event->type() == QEvent::Wrapped &&
+        if (event->type() == QEvent::StateMachineWrapped &&
             static_cast<QStateMachine::WrappedEvent *>(event)->event()->type() == QEvent::KeyPress) {
             QEvent *wrappedEvent = static_cast<QStateMachine::WrappedEvent *>(event)->event();
 
diff --git a/examples/symbianpkgrules.pri b/examples/symbianpkgrules.pri
index 59c5480..069a16e 100644
--- a/examples/symbianpkgrules.pri
+++ b/examples/symbianpkgrules.pri
@@ -11,3 +11,5 @@ vendorinfo = \
     " "
 
 default_deployment.pkg_prerules += vendorinfo
+
+!isEmpty(TARGET.UID3):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro
index b401c05..9b76d33 100644
--- a/examples/uitools/multipleinheritance/multipleinheritance.pro
+++ b/examples/uitools/multipleinheritance/multipleinheritance.pro
@@ -11,6 +11,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/uitools/multipleinheritance
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000D7C1
-}
\ No newline at end of file
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}
diff --git a/examples/video/videographicsitem/videographicsitem.pro b/examples/video/videographicsitem/videographicsitem.pro
index 7ebd975..d79c3fb 100644
--- a/examples/video/videographicsitem/videographicsitem.pro
+++ b/examples/video/videographicsitem/videographicsitem.pro
@@ -16,6 +16,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/video/videographicsitem
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000D7C2
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/video/videographicsitem/videoitem.h b/examples/video/videographicsitem/videoitem.h
index 80679dd..96f578a 100644
--- a/examples/video/videographicsitem/videoitem.h
+++ b/examples/video/videographicsitem/videoitem.h
@@ -50,6 +50,7 @@ class VideoItem
       public QGraphicsItem
 {
     Q_OBJECT
+    Q_INTERFACES(QGraphicsItem)
 public:
     explicit VideoItem(QGraphicsItem *parentItem = 0);
     ~VideoItem();
diff --git a/examples/video/videowidget/videowidget.pro b/examples/video/videowidget/videowidget.pro
index cc0260f..4a1d717 100644
--- a/examples/video/videowidget/videowidget.pro
+++ b/examples/video/videowidget/videowidget.pro
@@ -14,6 +14,6 @@ SOURCES = \
     videowidgetsurface.cpp
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000D7C3
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/webkit/formextractor/formextractor.pro b/examples/webkit/formextractor/formextractor.pro
index ba9c72f..4364b4c 100644
--- a/examples/webkit/formextractor/formextractor.pro
+++ b/examples/webkit/formextractor/formextractor.pro
@@ -16,6 +16,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/formextractor
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF6D
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/previewer.pro
index c3088a2..525dbb2 100644
--- a/examples/webkit/previewer/previewer.pro
+++ b/examples/webkit/previewer/previewer.pro
@@ -13,6 +13,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/previewer
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF6F
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/widgets/analogclock/analogclock.pro b/examples/widgets/analogclock/analogclock.pro
index 50c0a06..34c0ec5 100644
--- a/examples/widgets/analogclock/analogclock.pro
+++ b/examples/widgets/analogclock/analogclock.pro
@@ -9,6 +9,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/analogclock
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000A64F
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/widgets/calculator/calculator.pro b/examples/widgets/calculator/calculator.pro
index 585ff43..b31208e 100644
--- a/examples/widgets/calculator/calculator.pro
+++ b/examples/widgets/calculator/calculator.pro
@@ -11,6 +11,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/calculator
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C602
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/widgets/calendarwidget/calendarwidget.pro b/examples/widgets/calendarwidget/calendarwidget.pro
index f6cf21f..4675db1 100644
--- a/examples/widgets/calendarwidget/calendarwidget.pro
+++ b/examples/widgets/calendarwidget/calendarwidget.pro
@@ -9,6 +9,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/calendarwidget
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C603
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/widgets/lineedits/lineedits.pro b/examples/widgets/lineedits/lineedits.pro
index 409215c..0a40dcf 100644
--- a/examples/widgets/lineedits/lineedits.pro
+++ b/examples/widgets/lineedits/lineedits.pro
@@ -9,6 +9,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/lineedits
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C604
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/widgets/shapedclock/shapedclock.pro b/examples/widgets/shapedclock/shapedclock.pro
index bf4ee70..0a2515f 100644
--- a/examples/widgets/shapedclock/shapedclock.pro
+++ b/examples/widgets/shapedclock/shapedclock.pro
@@ -9,6 +9,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/shapedclock
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C605
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/widgets/softkeys/softkeys.pro b/examples/widgets/softkeys/softkeys.pro
index 6c3271e..d4d192f 100644
--- a/examples/widgets/softkeys/softkeys.pro
+++ b/examples/widgets/softkeys/softkeys.pro
@@ -10,6 +10,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/softkeys
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000CF6B
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/widgets/tetrix/tetrix.pro b/examples/widgets/tetrix/tetrix.pro
index d683f61..fbdb366 100644
--- a/examples/widgets/tetrix/tetrix.pro
+++ b/examples/widgets/tetrix/tetrix.pro
@@ -13,6 +13,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tetrix
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C606
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/widgets/wiggly/wiggly.pro b/examples/widgets/wiggly/wiggly.pro
index 857122f..f40f86f 100644
--- a/examples/widgets/wiggly/wiggly.pro
+++ b/examples/widgets/wiggly/wiggly.pro
@@ -11,6 +11,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/wiggly
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C607
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro
index f70fb7d..5e9c8ca 100644
--- a/examples/xml/htmlinfo/htmlinfo.pro
+++ b/examples/xml/htmlinfo/htmlinfo.pro
@@ -14,6 +14,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo
 INSTALLS += target sources
 
 symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.UID3 = 0xA000C609
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro
index 16ef184..4af3ddd 100644
--- a/examples/xml/saxbookmarks/saxbookmarks.pro
+++ b/examples/xml/saxbookmarks/saxbookmarks.pro
@@ -20,8 +20,8 @@ wince*: {
 }
 
 symbian: {
-     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
      TARGET.UID3 = 0xA000C60A
+     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
      addFiles.sources = frank.xbel jennifer.xbel
      addFiles.path = /data/qt/saxbookmarks
      DEPLOYMENT += addFiles