diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-05-26 03:35:53 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-05-26 04:12:04 (GMT) |
| commit | 3e3a5a2a2eece6e0eff934c34f25c41699a45b78 (patch) | |
| tree | 7305d5bfaca5033f6832834eb30dc44e3871b9b7 /examples/declarative/cppextensions/qwidgets | |
| parent | 4fe568ffb7a59909b0c72bed7da959fd36702f19 (diff) | |
| download | Qt-3e3a5a2a2eece6e0eff934c34f25c41699a45b78.zip Qt-3e3a5a2a2eece6e0eff934c34f25c41699a45b78.tar.gz Qt-3e3a5a2a2eece6e0eff934c34f25c41699a45b78.tar.bz2 | |
Unify naming of import plugin targets
Task-number: QTBUG-10834
Reviewed-by: Warwick Allison
Diffstat (limited to 'examples/declarative/cppextensions/qwidgets')
3 files changed, 10 insertions, 4 deletions
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 } |