aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-06-26 07:42:41 +0200
committerhjk <hjk@qt.io>2020-06-26 07:11:16 +0000
commitdbca37278053f95fa01c643a0867722dfcb09a55 (patch)
treee6f6f5dbddd470de5973aa5077d5a74fd70f6230 /share
parent0bf5ca1b3e6e2e3d48eb038177aba9621386f02d (diff)
QmlPuppet: Fall back to pre-Qt5.2 for QVariant comparison
Change-Id: Ibf55561e01f50ec7d689d40b50d100b8d257aa80 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp
index d5ddb20fa5..7f272b3636 100644
--- a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp
@@ -105,7 +105,7 @@ bool operator ==(const InformationContainer &first, const InformationContainer &
&& first.m_thirdInformation == second.m_thirdInformation;
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
static bool operator <(const QVariant &first, const QVariant &second)
{
if (first.userType() == second.userType()) {