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 @@ -105,33 +105,6 @@ QT_BEGIN_NAMESPACE \sa QLibrary, {Plug & Paint Example} */ -/*! - \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. */ @@ -475,10 +448,34 @@ QList QPluginLoader::staticPlugins() return QList(); } +/*! + \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 {