summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-05-27 00:25:04 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-05-27 00:25:04 (GMT)
commitfb5d338236976690312660bc017a8fe1e199326f (patch)
treef126ea5dfb367fc5212a62652162b84e86513aa4 /examples
parent487c05895751985a695f117fd984d1ecfe7b1252 (diff)
parent84f35321b867894470391d4997b5d58e34bce0ed (diff)
downloadQt-fb5d338236976690312660bc017a8fe1e199326f.zip
Qt-fb5d338236976690312660bc017a8fe1e199326f.tar.gz
Qt-fb5d338236976690312660bc017a8fe1e199326f.tar.bz2
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts: doc/src/declarative/advtutorial.qdoc
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir2
-rw-r--r--examples/declarative/cppextensions/imageprovider/imageprovider.pro9
-rw-r--r--examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir2
-rw-r--r--examples/declarative/cppextensions/plugins/plugin.cpp2
-rw-r--r--examples/declarative/cppextensions/plugins/plugins.pro2
-rw-r--r--examples/declarative/cppextensions/qwidgets/QWidgets/qmldir2
-rw-r--r--examples/declarative/cppextensions/qwidgets/qwidgets.cpp2
-rw-r--r--examples/declarative/cppextensions/qwidgets/qwidgets.pro10
-rw-r--r--examples/declarative/ui-components/dialcontrol/dialcontrol.qmlproject (renamed from examples/declarative/ui-components/dialcontrol/dial.qmlproject)0
9 files changed, 21 insertions, 10 deletions
diff --git a/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir b/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
index 1028590..6be88bc 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 462f7d9d..f218c30 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 e9ef115..e1288cf 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 2b1b320..355ca3f 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 d37ff40..b7610a8 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 e55267c..a7c1d95 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 228f9f1..47d3932 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 c5f8bcf..8d87804 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 d4909f8..d4909f8 100644
--- a/examples/declarative/ui-components/dialcontrol/dial.qmlproject
+++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.qmlproject