diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
| commit | c7934f2489e2eb9a539206bab35f335b1943c5bd (patch) | |
| tree | a27d0ed6c001fe9432e2a0f28fb935acf9e4c65f /examples/widgets | |
| parent | f40593b11199fbef886bfcb6b210a214d8c3adf3 (diff) | |
| parent | 08f9a1bd6ab9b1777ee5ba163d75e5c848c39eb4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/network/kernel/qnetworkinterface_winrt.cpp
tools/configure/configureapp.cpp
Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/doc/src/plugandpaint.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/widgets/doc/src/plugandpaint.qdoc b/examples/widgets/doc/src/plugandpaint.qdoc index cf83ea3507..b139de9fa1 100644 --- a/examples/widgets/doc/src/plugandpaint.qdoc +++ b/examples/widgets/doc/src/plugandpaint.qdoc @@ -285,9 +285,9 @@ \snippet tools/plugandpaint/main.cpp 0 - The argument to Q_IMPORT_PLUGIN() is the plugin's name, as - specified with Q_PLUGIN_METADATA() in the \l{Exporting the - Plugin}{plugin}. + The argument to Q_IMPORT_PLUGIN() is the plugin name, which corresponds + with the name of the class that declares metadata for the plugin with + Q_PLUGIN_METADATA(). In the \c .pro file, we need to specify the static library. Here's the project file for building Plug & Paint: |