diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-09-11 20:00:08 -0500 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-20 22:04:03 -0700 |
| commit | a0d66b60b75cfe3d7580c7016959890693b2a132 (patch) | |
| tree | 63734889c4f98bb767162051018cb304a7b208f2 /src/plugins | |
| parent | 2bea9b74ba4894c372b0587c0c5433b713b53e3a (diff) | |
QFactoryLoader: continue the port from JSON to CBOR
This continues the effort from the previous commit, by not passing
through the JSON conversion at all, and simply using CBOR directly.
The port in qtbase is complete, but in order to support the conversion
in other modules without introducing breakages, there's a temporary
class used for converting to QPluginParsedMetaData from
QJsonObject. It'll be removed once all other modules have finished
converting.
Change-Id: I2de1b4dfacd443148279fffd16a3ed4ddaf34afc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/ios/qiosfiledialog.mm | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qiosintegration.mm | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/ios/qiosfiledialog.mm b/src/plugins/platforms/ios/qiosfiledialog.mm index edf04016fd..a56bf25c16 100644 --- a/src/plugins/platforms/ios/qiosfiledialog.mm +++ b/src/plugins/platforms/ios/qiosfiledialog.mm @@ -87,7 +87,8 @@ bool QIOSFileDialog::showImagePickerDialog(QWindow *parent) { if (!m_viewController) { QFactoryLoader *plugins = QIOSIntegration::instance()->optionalPlugins(); - for (int i = 0; i < plugins->metaData().size(); ++i) { + qsizetype size = QList<QPluginParsedMetaData>(plugins->metaData()).size(); + for (qsizetype i = 0; i < size; ++i) { QIosOptionalPluginInterface *plugin = qobject_cast<QIosOptionalPluginInterface *>(plugins->instance(i)); m_viewController = [plugin->createImagePickerController(this) retain]; if (m_viewController) diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index 725c280129..8938f97ae5 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -125,7 +125,8 @@ void QIOSIntegration::initialize() #endif QMacInternalPasteboardMime::initializeMimeTypes(); - for (int i = 0; i < m_optionalPlugins->metaData().size(); ++i) + qsizetype size = QList<QPluginParsedMetaData>(m_optionalPlugins->metaData()).size(); + for (qsizetype i = 0; i < size; ++i) qobject_cast<QIosOptionalPluginInterface *>(m_optionalPlugins->instance(i))->initPlugin(); } |