diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-18 14:06:12 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-18 14:40:03 +0200 |
| commit | c97e894a248b5e63df0d7146fc321da984779b8e (patch) | |
| tree | f7c735cb34de2df87140f9e734c5b40be41b263f /share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp | |
| parent | 268a5f7a2a2a8533a4ee8756bfdb2c79eb545c3a (diff) | |
| download | qt-creator-c97e894a248b5e63df0d7146fc321da984779b8e.tar.gz | |
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 <marco.bubke@digia.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp index c0b8be04c6..020beed68d 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) { |