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:
  Doc fixes, improvements
  Allow js files with '.pragma library' to be used from WorkerScript
  Add more examples of XPath expressions to XmlRole.
  Open input panel on press if TextInput or TextEdit are already focused but panel has been closed
  Fix horizontal/verticalCenter anchors bug.
  Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap".
  Fix for qml reloaded in qml viewer not being maximized properly on a device
  Unify naming of import plugin targets
  Add a way to control when software input panels are shown in TextInput and TextEdit elements
  Replace QTime with QElapsedTimer
  Fix Gradient doc snippet.

3 files changed, 5 insertions, 5 deletions

diff --git a/demos/declarative/minehunt/MinehuntCore/qmldir b/demos/declarative/minehunt/MinehuntCore/qmldir
index 95bccc8..2beccf9 100644
--- a/demos/declarative/minehunt/MinehuntCore/qmldir
+++ b/demos/declarative/minehunt/MinehuntCore/qmldir
@@ -1,3 +1,3 @@
-plugin minehunt
+plugin qmlminehuntplugin
 Explosion 1.0 Explosion.qml
 Tile 1.0 Tile.qml
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 41640f5..91d02cf 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-TARGET  = minehunt
+TARGET  = qmlminehuntplugin
 QT += declarative
 CONFIG += qt plugin
 
@@ -28,11 +28,11 @@ symbian:{
     TARGET.EPOCALLOWDLLDATA = 1
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.CAPABILITY = NetworkServices ReadUserData
-    importFiles.sources = minehunt.dll \
+    importFiles.sources = qmlminehuntplugin.dll \
     MinehuntCore/Explosion.qml \
     MinehuntCore/pics \
     MinehuntCore/qmldir
-    importFiles.path = $$QT_IMPORTS_BASE_DIR/MinehuntCore 
+    importFiles.path = MinehuntCore
     DEPLOYMENT = importFiles
 }
  
diff --git a/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml b/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
index 2eaa40c..3828a40 100644
--- a/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
@@ -129,7 +129,7 @@ Item {
                 width: parent.width - 12
                 height: parent.height - 8
                 font.pointSize: 10
-                wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
+                wrapMode: TextEdit.Wrap
                 color: "#151515"; selectionColor: "green"
             }
             Keys.forwardTo: [(returnKey), (editor)]