diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-03 13:37:38 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-03 13:37:38 +0100 |
commit | c0a5e8c9d77aefd6c403af39908e56414a921522 (patch) | |
tree | c07b28deb9abc9789386f1b10585f1c661bfcba5 /src/corelib/plugin | |
parent | 4fd8513475222ee0afb6f18ec90ba384ffb03bc4 (diff) | |
parent | 2b5982aac8ad103443e33379fe5654f5bd419c87 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/plugins/platforms/xcb/qxcbscreen.cpp
Change-Id: Ie42931791a849b34b63d814d2eb5ac653986d868
Diffstat (limited to 'src/corelib/plugin')
-rw-r--r-- | src/corelib/plugin/qplugin.qdoc | 2 | ||||
-rw-r--r-- | src/corelib/plugin/qpluginloader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/plugin/qplugin.qdoc b/src/corelib/plugin/qplugin.qdoc index 35dd52218a..81be1df518 100644 --- a/src/corelib/plugin/qplugin.qdoc +++ b/src/corelib/plugin/qplugin.qdoc @@ -44,7 +44,7 @@ to the interface class called \a ClassName. The \a Identifier must be unique. For example: - \snippet plugins/interfaces.h 3 + \snippet code/doc_src_qplugin.cpp 0 This macro is normally used right after the class definition for \a ClassName, in a header file. See the diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp index 2151108bb7..2800656c13 100644 --- a/src/corelib/plugin/qpluginloader.cpp +++ b/src/corelib/plugin/qpluginloader.cpp @@ -428,7 +428,7 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin plugin) /*! Returns a list of static plugin instances (root components) held by the plugin loader. - \sa staticPlugin() + \sa staticPlugins() */ QObjectList QPluginLoader::staticInstances() { |