diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 14:45:59 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 14:45:59 +1000 |
| commit | 9bcea0318cae2f7fbfd24195ff9272cb369cb6e5 (patch) | |
| tree | b5b6b2f79c29bc9a339dcc7a918524ee7ab66016 /examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp | |
| parent | 124b71128feb596b136a545eb128c3b0e7093bf7 (diff) | |
| parent | 1cf2984ea74f837d4e8ae476dac2622f0a049eab (diff) | |
Merge branch 'master' into qtquick2
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
Diffstat (limited to 'examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp')
| -rw-r--r-- | examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp index 03f0384b25..add6a63b99 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp @@ -54,4 +54,4 @@ void DialogPlugin::registerTypes(const char *uri){ } //FileDialog is the plugin name (same as the TARGET in the project file) and DialogPlugin is the plugin classs -Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin);
\ No newline at end of file +Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin); |