From c0c5890b3f9cce4f4d75903677095e8d7da8026c Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Fri, 3 Aug 2012 16:55:25 +1000 Subject: Restore QML/C++ extensions tutorial and fix plugin docs and examples This restores the "Writing QML Extensions with C++" tutorial that was removed during the recent QML doc restructure. This also updates outdated docs in "Creating C++ Plugins for QML" that referred to the use of Q_EXPORT_PLUGIN2() and such as the process for writing QML plugins in Qt 5 has changed. Note the plugins.json line was removed from examples/qml/cppextensions/plugins/plugins.pro since this json file was removed in a previous commit, as plugins no longer require the empty json file. Change-Id: I795d6faf6a741466a952feb8e15b028ec3d52b69 Reviewed-by: Chris Adams --- src/quick/doc/src/appdevguide/porting.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quick/doc') diff --git a/src/quick/doc/src/appdevguide/porting.qdoc b/src/quick/doc/src/appdevguide/porting.qdoc index 3d1b209193..0f1cf1464c 100644 --- a/src/quick/doc/src/appdevguide/porting.qdoc +++ b/src/quick/doc/src/appdevguide/porting.qdoc @@ -219,7 +219,7 @@ All QML plugins should extend QQmlExtensionPlugin in Qt 5. Additionally, plugins should use the new Qt plugin infrastructure introduced in Qt 5. QML plugins no longer require the Q_EXPORT_PLUGIN2() macro. Instead, they should use the Q_PLUGIN_METADATA() macro -within the plugin class declarations and provide a \c .json file for the plugin. +within the plugin class declaration. See the updated \l {qtqml-modules-cppplugins.html}{Creating C++ Plugins For QML} documentation for an overview of creating QML plugins in Qt 5. -- cgit v1.2.3