aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-06-23 16:17:48 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2020-06-23 14:29:53 +0000
commit6791ddb27c0dce4907e18ef66a51f88220c51a6f (patch)
tree8f98439e8d5a91e8f281f9e495a9c4812b54a2a8 /src/shared
parent028c0b1cdda9538979c6d1287f55d3536ae412f9 (diff)
ProParser: Fix build with MSVC
Strangely, MSVC requires operator< for values of std::list. Change-Id: I5f62348a69d9b25585798b7824c6538d4cb5df7c Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/proparser/proitems.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/shared/proparser/proitems.h b/src/shared/proparser/proitems.h
index 3058b25c48..7fbeb54f1c 100644
--- a/src/shared/proparser/proitems.h
+++ b/src/shared/proparser/proitems.h
@@ -257,6 +257,15 @@ inline ProStringList operator+(const ProStringList &one, const ProStringList &tw
typedef QHash<ProKey, ProStringList> ProValueMap;
+// For std::list (sic!)
+#ifdef Q_CC_MSVC
+inline bool operator<(const ProValueMap &, const ProValueMap &)
+{
+ Q_ASSERT(false);
+ return false;
+}
+#endif
+
// These token definitions affect both ProFileEvaluator and ProWriter
enum ProToken {
TokTerminator = 0, // end of stream (possibly not included in length; must be zero)