summaryrefslogtreecommitdiff
path: root/src/scripttools/debugging
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-12-17 18:16:25 -0800
committerThiago Macieira <thiago.macieira@intel.com>2015-01-07 22:16:27 +0100
commit7962483cc9f6fa1c9b0f0341de9bf2f3f0f53dc7 (patch)
tree0169236423dec16f7bca18ea3df69be26d765f00 /src/scripttools/debugging
parent7a290532cc0ff56c05bb7d3dbb8fd00bd568e462 (diff)
downloadqtscript-7962483cc9f6fa1c9b0f0341de9bf2f3f0f53dc7.tar.gz
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 <ogoffart@woboq.com>
Diffstat (limited to 'src/scripttools/debugging')
-rw-r--r--src/scripttools/debugging/qscriptsyntaxhighlighter.cpp5
1 files changed, 2 insertions, 3 deletions
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 <algorithm>
@@ -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;
}