diff options
author | Robert Griebl <robert.griebl@qt.io> | 2020-11-20 23:56:08 +0100 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2020-11-28 17:47:47 +0100 |
commit | f4762958325130c9ec37ccb4b191368ef1412add (patch) | |
tree | 2c2977eb14dfe9466366c24c166ca956403662a7 /src/common-lib/qml-utilities.cpp | |
parent | 911ee1f92017f22f9aa1fd430b414ff28c7e0cbe (diff) |
Qt6 port, part 2 .. compiling with cmake
Change-Id: I0b3b0bd420fc2b5a5d263439ef263a8214bbdb4b
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'src/common-lib/qml-utilities.cpp')
-rw-r--r-- | src/common-lib/qml-utilities.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common-lib/qml-utilities.cpp b/src/common-lib/qml-utilities.cpp index 230f578d..65b2a6c6 100644 --- a/src/common-lib/qml-utilities.cpp +++ b/src/common-lib/qml-utilities.cpp @@ -72,18 +72,18 @@ void fixNullValuesForQml(QVariantMap &map) void fixNullValuesForQml(QVariant &v) { - switch (static_cast<int>(v.type())) { - case QVariant::List: { + switch (v.metaType().id()) { + case QMetaType::QVariantList: { QVariantList *list = qt6_v_cast<QVariantList>(&v.data_ptr()); fixNullValuesForQml(*list); break; } - case QVariant::Map: { + case QMetaType::QVariantMap: { QVariantMap *map = qt6_v_cast<QVariantMap>(&v.data_ptr()); fixNullValuesForQml(*map); break; } - case QVariant::Invalid: { + case QMetaType::UnknownType: { QVariant v2 = QVariant::fromValue(nullptr); std::swap(v.data_ptr(), v2.data_ptr()); break; |