Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (77 commits)
  Recompute the source location of regexp literals.
  Adds a way to  clear the state list property in QDeclarativeStateGroup
  I've been told this fixes compilation on windows.
  Doc Augmentation
  Added highlight ranges/modes to PathView
  Use QThread IdlePriority rather than linux platform code.
  Test and fix order of transform application.
  Test transforms.
  Fix namespace.
  Simple case, no size returned.
  sourceWidth/sourceHeight -> sourceSize
  QDeclarativeItem don't need to emit childrenChanged anymore.
  Control of image rendered size (esp. SVG).
  Do not call parent implementation if we accept the keyPressEvent in GridView and ListView delegates.
  Update test.
  Add autotest for QTBUG-9367.
  Remove Q prefix from the validators.
  Really fix qMin() parameter types.
  Add declarative subdir to examples.pro
  Add Symbian deploy section for qml import plugins
  ...

5 files changed, 19 insertions, 4 deletions

diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 2df33e6..03059c7 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -23,3 +23,18 @@ MinehuntCore_sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCo
 
 INSTALLS = sources MinehuntCore_sources target
 
+symbian:{
+    load(data_caging_paths)
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.CAPABILITY = CAP_GENERAL_DLL
+    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    
+    importFiles.sources = minehunt.dll \
+    MinehuntCore/Explosion.qml \
+    MinehuntCore/pics \
+    MinehuntCore/qmldir
+    importFiles.path = $$QT_IMPORTS_BASE_DIR/MinehuntCore 
+    DEPLOYMENT = importFiles
+}
+ 
+INSTALLS = sources MinehuntCore_sources target
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml
index 9e99706..2ca6c4c 100644
--- a/demos/declarative/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/minehunt.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
-import MinehuntCore 1.0
+import "MinehuntCore" 1.0
 
 Item {
     id: field
diff --git a/demos/declarative/photoviewer/photoviewer.qml b/demos/declarative/photoviewer/photoviewer.qml
index 8feee02..662ea12 100644
--- a/demos/declarative/photoviewer/photoviewer.qml
+++ b/demos/declarative/photoviewer/photoviewer.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
-import PhotoViewerCore 1.0
+import "PhotoViewerCore" 1.0
 
 Rectangle {
     id: mainWindow
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index f084ff6..6c58d49 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
-import SamegameCore 1.0
+import "SamegameCore" 1.0
 import "SamegameCore/samegame.js" as Logic
 
 Rectangle {
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index 259f79a..94d53f1 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
-import TwitterCore 1.0 as Twitter
+import "TwitterCore" 1.0 as Twitter
 
 Item {
     id: screen; width: 320; height: 480