Renamed widgets example to proxywidgets to avoid conflicts

Task-number: QTBUG-9518
Reviewed-by: Martin Jones

7 files changed, 14 insertions, 11 deletions

diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index 5fc1cf0..00d3c05 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -6,7 +6,7 @@ SUBDIRS = \
    imageprovider \
    objectlistmodel \
    plugins \
-   widgets
+   proxywidgets
 
 # These examples contain no C++ and can simply be copied
 sources.files = \
diff --git a/examples/declarative/proxywidgets/ProxyWidgets/qmldir b/examples/declarative/proxywidgets/ProxyWidgets/qmldir
new file mode 100644
index 0000000..e55267c
--- /dev/null
+++ b/examples/declarative/proxywidgets/ProxyWidgets/qmldir
@@ -0,0 +1 @@
+plugin proxywidgetsplugin
diff --git a/examples/declarative/widgets/README b/examples/declarative/proxywidgets/README
index f85a1e8..f50fa22 100644
--- a/examples/declarative/widgets/README
+++ b/examples/declarative/proxywidgets/README
@@ -1,4 +1,4 @@
 To run:
 
   make install
-  qml mywidgets.qml
+  qml proxywidgets.qml
diff --git a/examples/declarative/widgets/mywidgets.cpp b/examples/declarative/proxywidgets/proxywidgets.cpp
index e17240d..47d0cb9 100644
--- a/examples/declarative/widgets/mywidgets.cpp
+++ b/examples/declarative/proxywidgets/proxywidgets.cpp
@@ -82,7 +82,7 @@ private:
     QPushButton *widget;
 };
 
-class MyWidgetsPlugin : public QDeclarativeExtensionPlugin
+class ProxyWidgetsPlugin : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
@@ -92,8 +92,8 @@ public:
     }
 };
 
-#include "mywidgets.moc"
+#include "proxywidgets.moc"
 
 QML_DECLARE_TYPE(MyPushButton)
 
-Q_EXPORT_PLUGIN2(mywidgetsplugin, MyWidgetsPlugin);
+Q_EXPORT_PLUGIN2(proxywidgetsplugin, ProxyWidgetsPlugin);
diff --git a/examples/declarative/widgets/mywidgets.pro b/examples/declarative/proxywidgets/proxywidgets.pro
index 258edb1..eb85191 100644
--- a/examples/declarative/widgets/mywidgets.pro
+++ b/examples/declarative/proxywidgets/proxywidgets.pro
@@ -1,13 +1,13 @@
 TEMPLATE = lib
-DESTDIR = MyWidgets
-TARGET  = mywidgetsplugin
+DESTDIR = ProxyWidgets
+TARGET  = proxywidgetsplugin
 CONFIG += qt plugin
 QT += declarative
 VERSION = 1.0.0
 
-SOURCES += mywidgets.cpp
+SOURCES += proxywidgets.cpp
 
-sources.files += mywidgets.pro mywidgets.cpp mywidgets.qml
+sources.files += proxywidgets.pro proxywidgets.cpp proxywidgets.qml
 
 sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
 
@@ -17,3 +17,6 @@ INSTALLS += sources target
 
 symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 
+symbian:{
+    TARGET.EPOCALLOWDLLDATA = 1
+}
\ No newline at end of file
diff --git a/examples/declarative/widgets/mywidgets.qml b/examples/declarative/proxywidgets/proxywidgets.qml
index b1efed4..023de71 100644
--- a/examples/declarative/widgets/mywidgets.qml
+++ b/examples/declarative/proxywidgets/proxywidgets.qml
@@ -1,5 +1,5 @@
 import Qt 4.6
-import "MyWidgets" 1.0
+import "ProxyWidgets" 1.0
 
 Rectangle {
     id: window
diff --git a/examples/declarative/widgets/MyWidgets/qmldir b/examples/declarative/widgets/MyWidgets/qmldir
deleted file mode 100644
index dc1d10e..0000000
--- a/examples/declarative/widgets/MyWidgets/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-plugin mywidgetsplugin