diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-24 13:14:51 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-28 07:09:48 +0200 |
| commit | 4ccebdf12d27bfd7049ef2da0e6183539c94aa7a (patch) | |
| tree | 809c96db3fa0514f17e39a0e9627aca31623badd /src | |
| parent | 7542638e0c0dacb5a8a590b5bd4d30293225fbaf (diff) | |
Fix some qdoc warnings from QStaticPlugin
Move all the documentation for that class into one place, and remove
rawMetaData documentation and references; it is a private variable, and
shouldn't be documented.
The instance member is a function pointer type variable, but should
be treated as a member function. Even with a Q_QDOC ifdef'ery we can't fix
that warning (we would get a lot of new warnings instead), so leave that
as is for now.
Change-Id: I951aaafad8dca5ed2533ace69931f002eb97996a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/plugin/qpluginloader.cpp | 53 |
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 { |