feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix build with Qt dev (5.2)

Browse Source 
QVariant now has an operator< that is ambiguous with this one.
(since commit 7ed15da3c1b9e2bb26f414a10bfc6e6d79d7cc7b in qtbase)

Change-Id: Idf38afe85cec966df1885aa2da0f37fbb3eeccf6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Simon Hausmann
2013-07-18 14:06:12 +02:00
parent 268a5f7a2a
commit c97e894a24
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp
View File

@@ -109,6 +109,7 @@ bool operator ==(const InformationContainer &first, const InformationContainer &
&& first.m_thirdInformation == second.m_thirdInformation; && first.m_thirdInformation == second.m_thirdInformation;
} }
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
static bool operator <(const QVariant &first, const QVariant &second) static bool operator <(const QVariant &first, const QVariant &second)
{ {
if (first.userType() == second.userType()) { if (first.userType() == second.userType()) {
@@ -118,6 +119,7 @@ static bool operator <(const QVariant &first, const QVariant &second)
return true; return true;
} }
#endif
bool operator <(const InformationContainer &first, const InformationContainer &second) bool operator <(const InformationContainer &first, const InformationContainer &second)
{ {