diff options
| author | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2013-08-22 13:16:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-04 09:38:35 +0200 |
| commit | 8b7a8efe66afecde87b45adf1c6e850f63670f86 (patch) | |
| tree | e0396d4777bc53c912a29b84baa6d47ad75d1c01 /tests | |
| parent | 500deb9a08242d177fdad9a8b5a57b560e754db1 (diff) | |
QPluginLoader: add 'staticPlugins' function
Currently there is no API to extract the meta data
from static plugins. This is needed in e.g QtDeclarative
for loading static module plugins.
This patch moves the 'staticPlugins' function from
QLibraryPrivate into QPluginLoader, and makes it public.
As such, we now also export QStaticPlugin.
Since an application developer cannot do much with raw
metadata, we add a new function
QStaticPlugin::metaData() that returns the QJsonObject
for the plugin. The old metaData function is
renamed 'rawMetaData'.
Change-Id: Idb0bf9ad8ebb13340565512e1998b26e762a357e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index 663f664d94..0f224c4909 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -765,7 +765,7 @@ void tst_QGuiApplication::genericPluginsAndWindowSystemEvents() QStaticPlugin testPluginInfo; testPluginInfo.instance = qt_plugin_instance; - testPluginInfo.metaData = qt_plugin_query_metadata; + testPluginInfo.rawMetaData = qt_plugin_query_metadata; qRegisterStaticPluginFunction(testPluginInfo); int argc = 3; char *argv[] = { const_cast<char*>("tst_qguiapplication"), const_cast<char*>("-plugin"), const_cast<char*>("testplugin") }; |