diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-09-21 14:55:20 -0700 |
|---|---|---|
| committer | Andrei Golubev <andrei.golubev@qt.io> | 2021-11-01 22:26:44 +0200 |
| commit | 6f3ccb309d328e92ad0ee6cdf67da3dbc4b1afbc (patch) | |
| tree | 2be8565f1343a4887295a3f781992c985fdc2552 /src/qml/debugger | |
| parent | 8dbe4c4e99fc9252587967662c16f8b59b85239f (diff) | |
Plugins: Port to QPluginParsedMetaData and CBOR
QFactoryLoader now no longer converts its internal metadata to JSON, so
we may as well not do it here either. All of this is internal API, so we
can change.
Change-Id: I3eb1bd30e0124f89a052fffd16a6f2d82ad568af
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/debugger')
| -rw-r--r-- | src/qml/debugger/qqmldebugconnector.cpp | 8 | ||||
| -rw-r--r-- | src/qml/debugger/qqmldebugpluginmanager_p.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/debugger/qqmldebugconnector.cpp b/src/qml/debugger/qqmldebugconnector.cpp index 74b10e64d7..dabe6bfabe 100644 --- a/src/qml/debugger/qqmldebugconnector.cpp +++ b/src/qml/debugger/qqmldebugconnector.cpp @@ -41,10 +41,10 @@ #include "qqmldebugconnector_p.h" #include "qqmldebugservicefactory_p.h" #include <QtCore/QPluginLoader> +#include <QtCore/QCborArray> #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QDebug> -#include <QtCore/QJsonArray> #include <QtCore/QDataStream> #include <private/qcoreapplication_p.h> @@ -145,10 +145,10 @@ QQmlDebugConnector *QQmlDebugConnector::instance() if (params->instance) { const auto metaData = metaDataForQQmlDebugService(); - for (const QJsonObject &object : metaData) { - const auto keys = object.value(QLatin1String("MetaData")).toObject() + for (const QPluginParsedMetaData &md : metaData) { + const auto keys = md.value(QtPluginMetaDataKeys::MetaData).toMap() .value(QLatin1String("Keys")).toArray(); - for (const QJsonValue key : keys) { + for (const QCborValue key : keys) { QString keyString = key.toString(); if (params->services.isEmpty() || params->services.contains(keyString)) loadQQmlDebugService(keyString); diff --git a/src/qml/debugger/qqmldebugpluginmanager_p.h b/src/qml/debugger/qqmldebugpluginmanager_p.h index 0ae872e477..48d32385b8 100644 --- a/src/qml/debugger/qqmldebugpluginmanager_p.h +++ b/src/qml/debugger/qqmldebugpluginmanager_p.h @@ -60,15 +60,15 @@ QT_BEGIN_NAMESPACE #if !QT_CONFIG(qml_debug) #define Q_QML_DEBUG_PLUGIN_LOADER(interfaceName)\ - interfaceName *load##interfaceName(const QString &key)\ + static interfaceName *load##interfaceName(const QString &key)\ {\ qWarning() << "Qml Debugger: QtQml is not configured for debugging. Ignoring request for"\ << "debug plugin" << key;\ return 0;\ }\ - QList<QJsonObject> metaDataFor##interfaceName()\ + Q_DECL_UNUSED static QList<QPluginParsedMetaData> metaDataFor##interfaceName()\ {\ - return QList<QJsonObject>();\ + return {};\ } #else // QT_CONFIG(qml_debug) @@ -76,11 +76,11 @@ QT_BEGIN_NAMESPACE #define Q_QML_DEBUG_PLUGIN_LOADER(interfaceName)\ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, interfaceName##Loader,\ (interfaceName##Factory_iid, QLatin1String("/qmltooling")))\ - interfaceName *load##interfaceName(const QString &key)\ + static interfaceName *load##interfaceName(const QString &key)\ {\ return qLoadPlugin<interfaceName, interfaceName##Factory>(interfaceName##Loader(), key);\ }\ - QList<QJsonObject> metaDataFor##interfaceName()\ + Q_DECL_UNUSED static QList<QPluginParsedMetaData> metaDataFor##interfaceName()\ {\ return interfaceName##Loader()->metaData();\ } |