From 7962483cc9f6fa1c9b0f0341de9bf2f3f0f53dc7 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 17 Dec 2014 18:16:25 -0800 Subject: Replace Q_STATIC_GLOBAL_OPERATOR with its expansion This existed to work around compiler bugs with RVCT. Let's assume anyone still using RVCT is using a newer version. Change-Id: Ic1c1a8b13e0e1d4393c701a6c308df37e80da555 Reviewed-by: Olivier Goffart --- src/scripttools/debugging/qscriptsyntaxhighlighter.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/scripttools/debugging') diff --git a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp index 9d00fc9..05c7da4 100644 --- a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp +++ b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp @@ -32,7 +32,6 @@ ****************************************************************************/ #include "qscriptsyntaxhighlighter_p.h" -#include "private/qfunctions_p.h" #include @@ -123,12 +122,12 @@ struct KeywordHelper const QString needle; }; -Q_STATIC_GLOBAL_OPERATOR bool operator<(const KeywordHelper &helper, const char *kw) +static bool operator<(const KeywordHelper &helper, const char *kw) { return helper.needle < QLatin1String(kw); } -Q_STATIC_GLOBAL_OPERATOR bool operator<(const char *kw, const KeywordHelper &helper) +static bool operator<(const char *kw, const KeywordHelper &helper) { return QLatin1String(kw) < helper.needle; } -- cgit v1.2.1