From c97e894a248b5e63df0d7146fc321da984779b8e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 18 Jul 2013 14:06:12 +0200 Subject: [PATCH] Fix build with Qt dev (5.2) QVariant now has an operator< that is ambiguous with this one. (since commit 7ed15da3c1b9e2bb26f414a10bfc6e6d79d7cc7b in qtbase) Change-Id: Idf38afe85cec966df1885aa2da0f37fbb3eeccf6 Reviewed-by: Marco Bubke --- .../qtcreator/qml/qmlpuppet/container/informationcontainer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp index c0b8be04c66..020beed68d5 100644 --- a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp +++ b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp @@ -109,6 +109,7 @@ bool operator ==(const InformationContainer &first, const InformationContainer & && first.m_thirdInformation == second.m_thirdInformation; } +#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) static bool operator <(const QVariant &first, const QVariant &second) { if (first.userType() == second.userType()) { @@ -118,6 +119,7 @@ static bool operator <(const QVariant &first, const QVariant &second) return true; } +#endif bool operator <(const InformationContainer &first, const InformationContainer &second) {