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

Conflicts:
	doc/src/declarative/advtutorial.qdoc

9 files changed, 21 insertions, 10 deletions

diff --git a/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir b/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
index 1028590a84..6be88bccec 100644
--- a/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
+++ b/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
@@ -1,2 +1,2 @@
-plugin imageprovider
+plugin qmlimageproviderplugin
 
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
index 462f7d9d93..f218c30dc5 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
@@ -3,7 +3,7 @@ CONFIG += qt plugin
 QT += declarative
 
 DESTDIR = ImageProviderCore
-TARGET  = imageprovider
+TARGET  = qmlimageproviderplugin
 
 SOURCES += imageprovider.cpp
 
@@ -18,7 +18,12 @@ ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovid
 
 INSTALLS = sources ImageProviderCore_sources target
 
-symbian {
+symbian:{
+    load(data_caging_paths)
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.EPOCALLOWDLLDATA = 1
+
+    importFiles.sources = qmlimageproviderplugin.dll ImageProviderCore/qmldir
+    importFiles.path = ImageProviderCore
+    DEPLOYMENT = importFiles
 }
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
index e9ef11530f..e1288cfac0 100644
--- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
@@ -1,2 +1,2 @@
 Clock 1.0 Clock.qml
-plugin qtimeexampleqmlplugin
+plugin qmlqtimeexampleplugin
diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp
index 2b1b320161..355ca3fb7e 100644
--- a/examples/declarative/cppextensions/plugins/plugin.cpp
+++ b/examples/declarative/cppextensions/plugins/plugin.cpp
@@ -148,4 +148,4 @@ public:
 
 #include "plugin.moc"
 
-Q_EXPORT_PLUGIN2(qtimeexampleqmlplugin, QExampleQmlPlugin);
+Q_EXPORT_PLUGIN2(qmlqtimeexampleplugin, QExampleQmlPlugin);
diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro
index d37ff40c9d..b7610a8823 100644
--- a/examples/declarative/cppextensions/plugins/plugins.pro
+++ b/examples/declarative/cppextensions/plugins/plugins.pro
@@ -3,7 +3,7 @@ CONFIG += qt plugin
 QT += declarative
 
 DESTDIR = com/nokia/TimeExample
-TARGET = qtimeexampleqmlplugin
+TARGET  = qmlqtimeexampleplugin
 
 SOURCES += plugin.cpp
 
diff --git a/examples/declarative/cppextensions/qwidgets/QWidgets/qmldir b/examples/declarative/cppextensions/qwidgets/QWidgets/qmldir
index e55267c429..a7c1d95c76 100644
--- a/examples/declarative/cppextensions/qwidgets/QWidgets/qmldir
+++ b/examples/declarative/cppextensions/qwidgets/QWidgets/qmldir
@@ -1 +1 @@
-plugin proxywidgetsplugin
+plugin qmlqwidgetsplugin
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
index 228f9f18eb..47d3932f87 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
@@ -94,4 +94,4 @@ public:
 
 #include "qwidgets.moc"
 
-Q_EXPORT_PLUGIN2(qwidgetsplugin, QWidgetsPlugin);
+Q_EXPORT_PLUGIN2(qmlqwidgetsplugin, QWidgetsPlugin);
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
index c5f8bcffb5..8d878045e0 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
@@ -3,7 +3,7 @@ CONFIG += qt plugin
 QT += declarative
 
 DESTDIR = QWidgets
-TARGET = qwidgetsplugin
+TARGET = qmlqwidgetsplugin
 
 SOURCES += qwidgets.cpp
 
@@ -13,7 +13,13 @@ target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
 
 INSTALLS += sources target
 
-symbian {
+symbian:{
+    load(data_caging_paths)
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     TARGET.EPOCALLOWDLLDATA = 1
+
+    importFiles.sources = qmlqwidgetsplugin.dll QWidgets/qmldir
+    importFiles.path = QWidgets
+
+    DEPLOYMENT = importFiles
 }
diff --git a/examples/declarative/ui-components/dialcontrol/dial.qmlproject b/examples/declarative/ui-components/dialcontrol/dialcontrol.qmlproject
index d4909f8685..d4909f8685 100644
--- a/examples/declarative/ui-components/dialcontrol/dial.qmlproject
+++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.qmlproject