diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2019-12-03 20:24:38 +0100 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2020-01-17 11:31:35 +0100 |
| commit | c6899f16389458766904d8d913054f09076e06dd (patch) | |
| tree | e24f942a01720775391ae04557e24a35839f7361 /src/imports/settings | |
| parent | 9e674be4fb8c369873a009f58e3152a12d2c4cce (diff) | |
Replace QVariant::type with QVariant::userType
as type is going to be deprecated.
This change was done automatically with the help of clazy.
In addition, ColumnRoleMetadata was changed to take an int instead
of a QVariant::Type
Change-Id: Ibc02d7b52e7d931a56c19fdebc4788b5e6df2a39
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/imports/settings')
| -rw-r--r-- | src/imports/settings/qqmlsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/settings/qqmlsettings.cpp b/src/imports/settings/qqmlsettings.cpp index d43f9bafb7..de45f87638 100644 --- a/src/imports/settings/qqmlsettings.cpp +++ b/src/imports/settings/qqmlsettings.cpp @@ -335,7 +335,7 @@ void QQmlSettingsPrivate::load() const QVariant currentValue = instance()->value(property.name(), previousValue); if (!currentValue.isNull() && (!previousValue.isValid() - || (currentValue.canConvert(previousValue.type()) && previousValue != currentValue))) { + || (currentValue.canConvert(previousValue.userType()) && previousValue != currentValue))) { property.write(q, currentValue); qCDebug(lcSettings) << "QQmlSettings: load" << property.name() << "setting:" << currentValue << "default:" << previousValue; } |