Merge remote branch 'origin/4.7' into oslo-staging-1

Conflicts:
	doc/src/declarative/advtutorial.qdoc

3 files changed, 5 insertions, 5 deletions

diff --git a/demos/declarative/minehunt/MinehuntCore/qmldir b/demos/declarative/minehunt/MinehuntCore/qmldir
index 95bccc8a69..2beccf9e4d 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 41640f5287..91d02cf461 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 2eaa40c387..3828a404a7 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)]