diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2020-05-02 17:55:38 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2020-08-02 10:16:19 -0700 |
commit | 53b71057390a31532517fead1eda1be2c503f6ef (patch) | |
tree | ceeab927a0c7268600ed21d983804555ed3fcdce | |
parent | 081a5a0f6dd4cceb18b79e164331bb8fa26f2b88 (diff) |
Fix Qt 6 compatibility: QMap will no longer support insertMulti
Just use insert(). The map will no longer have multiple values for the
same key, but those weren't accessible from QML anyway. This may change
which value is reported in QML now, but the API was already bbroken
Change-Id: I99ab0f318b1c43b89888fffd160b5ea0c1a9e170
(cherry-picked from commit 98d5b12c39ea442f3826ac2cac345b9d5422f61a)
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r-- | src/imports/scxmlstatemachine/invokedservices.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/scxmlstatemachine/invokedservices.cpp b/src/imports/scxmlstatemachine/invokedservices.cpp index 5bdb4f0..8c14922 100644 --- a/src/imports/scxmlstatemachine/invokedservices.cpp +++ b/src/imports/scxmlstatemachine/invokedservices.cpp @@ -73,7 +73,7 @@ QVariantMap QScxmlInvokedServices::children() if (m_stateMachine) { const QVector<QScxmlInvokableService *> children = m_stateMachine->invokedServices(); for (QScxmlInvokableService *service : children) - ret.insertMulti(service->name(), QVariant::fromValue(service)); + ret.insert(service->name(), QVariant::fromValue(service)); } return ret; } |