diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 15:21:52 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 15:23:09 +0100 |
| commit | 49651307807fc097d14ae13fb71013e46944eb2a (patch) | |
| tree | 3bc227a47f42c2edb7ff4b69fc183b4a99fe0bf3 /examples/quick/tutorials | |
| parent | 15b232bf694fedf553abac09af077a58ce571f9d (diff) | |
| parent | f4d4689d3c09cb4eae30be892be426d4fa185ed4 (diff) | |
Merge branch 'release' into stable
Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5
Diffstat (limited to 'examples/quick/tutorials')
| -rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp | 3 | ||||
| -rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp index f9b8ce6078..9da7a4a540 100644 --- a/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp @@ -52,6 +52,3 @@ void DialogPlugin::registerTypes(const char *uri){ //qRegisterMetaType<QQmlListProperty<QString> > ("QQmlListProperty<QString>"); } - -//FileDialog is the plugin name (same as the TARGET in the project file) and DialogPlugin is the plugin classs -Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin); diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h index 54b374621c..58248ffcac 100644 --- a/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h @@ -46,7 +46,7 @@ class DialogPlugin : public QQmlExtensionPlugin { Q_OBJECT - + Q_PLUGIN_METADATA(IID "org.qt-project.QmlExtensionPlugin.FileDialog") public: //registerTypes is inherited from QQmlExtensionPlugin void registerTypes(const char *uri); |