diff options
| -rw-r--r-- | examples/widgets/tools/settingseditor/settingstree.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/tools/settingseditor/settingstree.cpp b/examples/widgets/tools/settingseditor/settingstree.cpp index 04af8ce3b9..bcbf3744a5 100644 --- a/examples/widgets/tools/settingseditor/settingstree.cpp +++ b/examples/widgets/tools/settingseditor/settingstree.cpp @@ -214,7 +214,7 @@ void SettingsTree::updateChildItems(QTreeWidgetItem *parent) if (value.userType() == QMetaType::UnknownType) { child->setText(1, "Invalid"); } else { - if (value.type() == QVariant::String) { + if (value.typeId() == QMetaType::QString) { const QString stringValue = value.toString(); if (m_typeChecker->boolExp.match(stringValue).hasMatch()) { value.setValue(stringValue.compare("true", Qt::CaseInsensitive) == 0); diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index d95d3cd0fb..9ebdbc4a18 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -333,7 +333,7 @@ class Q_CORE_EXPORT QVariant explicit QVariant(Type type) : QVariant(QMetaType(int(type))) {} - QT_DEPRECATED_VERSION_X_6_0("Use metaType().") + QT_DEPRECATED_VERSION_X_6_0("Use typeId() or metaType().") Type type() const { int type = d.typeId(); |