summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolás Alvarez <nicolas.alvarez@gmail.com>2013-09-15 02:39:24 -0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-15 19:51:50 +0200
commit1985f818e7c543393660c50dccfb078d9f3c4501 (patch)
tree75f8292b581842fd8208d3838a3cb5ae019838da
parentf6f1f44e71ba3611ce15a66d7e068bd139263501 (diff)
Fix QTextEngine build on MSVC2008 debug mode.
This was broken in 7ac6ce21 which removed some unused functions; but MSVC2008 in debug mode requires this particular operator overload. I'm re-adding it in an appropriate #ifdef so it doesn't cause "unused" warnings in other platforms/compilers. Task-number: QTBUG-33473 Change-Id: I6dfba0fa5f835e848e8a1e4213efb030fb5def3d Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
-rw-r--r--src/gui/text/qtextengine.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index c690fed996..241ed21a10 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2762,6 +2762,7 @@ struct QScriptItemComparator {
#if defined(Q_CC_MSVC) && _MSC_VER < 1600
//The STL implementation of MSVC 2008 requires the definition
bool operator()(const QScriptItem &a, int p) { return a.position < p; }
+ bool operator()(const QScriptItem &a, const QScriptItem &b) { return a.position < b.position; }
#endif
};
}