diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-25 12:22:50 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-25 12:23:22 +0100 |
| commit | 709e40093e6081b18e0d3003e0a088e1a9b6f211 (patch) | |
| tree | 0f7c729c13b5a17f11ce176906f62ef43ea895a2 /src/corelib/plugin | |
| parent | 62cd369594dc39e06e8c7ec2c761cfedf5d9c9ba (diff) | |
| parent | 34b14a8472f44f8517577756e033b92ebd4c5912 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ie709286a14b452dae7abb59830f584bb33f1ccf5
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/qpluginloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp index 8ed9199c60..0bdf9034ee 100644 --- a/src/corelib/plugin/qpluginloader.cpp +++ b/src/corelib/plugin/qpluginloader.cpp @@ -420,7 +420,7 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin plugin) /*! Returns a list of static plugin instances (root components) held by the plugin loader. - \sa staticPlugins() + \sa staticPlugin() */ QObjectList QPluginLoader::staticInstances() { |