summaryrefslogtreecommitdiffstats
path: root/src/corelib/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/plugin')
-rw-r--r--src/corelib/plugin/qpluginloader.cpp53
1 files changed, 25 insertions, 28 deletions
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index ef8ad108cb..f957c75ab8 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -106,33 +106,6 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \class QStaticPlugin
- \inmodule QtCore
- \since 5.2
-
- \brief QStaticPlugin is a struct containing a reference to a
- static plugin instance together with its meta data.
-
- \sa QPluginLoader, {How to Create Qt Plugins}
-*/
-
-/*!
- \fn QObject *QStaticPlugin::instance()
-
- Returns the plugin instance.
-
- \sa QPluginLoader::staticInstances()
-*/
-
-/*!
- \fn const char *QStaticPlugin::rawMetaData()
-
- Returns the raw meta data for the plugin.
-
- \sa metaData(), Q_PLUGIN_METADATA()
-*/
-
-/*!
Constructs a plugin loader with the given \a parent.
*/
QPluginLoader::QPluginLoader(QObject *parent)
@@ -476,9 +449,33 @@ QList<QStaticPlugin> QPluginLoader::staticPlugins()
}
/*!
+ \class QStaticPlugin
+ \inmodule QtCore
+ \since 5.2
+
+ \brief QStaticPlugin is a struct containing a reference to a
+ static plugin instance together with its meta data.
+
+ \sa QPluginLoader, {How to Create Qt Plugins}
+*/
+
+/*!
+ \fn QStaticPlugin::QStaticPlugin(QtPluginInstanceFunction i, QtPluginMetaDataFunction m)
+ \internal
+*/
+
+/*!
+ \fn QObject *QStaticPlugin::instance()
+
+ Returns the plugin instance.
+
+ \sa QPluginLoader::staticInstances()
+*/
+
+/*!
Returns a the meta data for the plugin as a QJsonObject.
- \sa rawMetaData()
+ \sa Q_PLUGIN_METADATA()
*/
QJsonObject QStaticPlugin::metaData() const
{