diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-02-06 23:36:17 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 17:27:37 +0100 |
| commit | 7184456f9a26a9c07a689c15b415ddf82eb000b7 (patch) | |
| tree | 076d42ad3fd6f08a1cbef21ee6811a3fa951850b /src/corelib/plugin/qfactoryloader_p.h | |
| parent | 556dd0228aca07dfe8443fd99e9f2ead4e13ab22 (diff) | |
Implement new plugin mechanism
moc can now embed meta information about the plugin
inside the plugin itself. This information can
be queried by Qt without having to load the plugin.
Source compatibility with the old plugin loading
mechanism is still there, but will be removed before
Qt 5.0.
Change-Id: I03e4196ddfed07d0fe94acca40d5de8a6ce7f920
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/plugin/qfactoryloader_p.h')
| -rw-r--r-- | src/corelib/plugin/qfactoryloader_p.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/plugin/qfactoryloader_p.h b/src/corelib/plugin/qfactoryloader_p.h index 2241a22e5f..ee7a68d6f8 100644 --- a/src/corelib/plugin/qfactoryloader_p.h +++ b/src/corelib/plugin/qfactoryloader_p.h @@ -55,8 +55,8 @@ #include "QtCore/qobject.h" #include "QtCore/qstringlist.h" +#include "QtCore/qjsonobject.h" #include "private/qlibrary_p.h" - #ifndef QT_NO_LIBRARY QT_BEGIN_NAMESPACE @@ -74,8 +74,11 @@ public: Qt::CaseSensitivity = Qt::CaseSensitive); ~QFactoryLoader(); - QStringList keys() const; - QObject *instance(const QString &key) const; + QT_DEPRECATED QStringList keys() const; + QList<QJsonObject> metaData() const; + + QT_DEPRECATED QObject *instance(const QString &key) const; + QObject *instance(int index) const; #if defined(Q_OS_UNIX) && !defined (Q_OS_MAC) QLibraryPrivate *library(const QString &key) const; |