From ef1335b1ab76fb3ee1082b5abab66b43fa45df1d Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Thu, 20 Aug 2009 19:00:09 +0200 Subject: Make qregexp.cpp compile with RVCT. The C++ standard says that templates do not consider non-exported operators, but most compilers ignore that rule. RVCT however, does not so add the Q_STATIC_GLOBAL_OPERATOR macro here which expands to 'inline' for RVCT instead of 'static'. Reviewed-by: Harald Fernengel --- src/corelib/tools/qregexp.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 41df6cc..3cec0bf 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -52,6 +52,7 @@ #include "qstringlist.h" #include "qstringmatcher.h" #include "qvector.h" +#include "private/qfunctions_p.h" #include @@ -832,7 +833,7 @@ struct QRegExpEngineKey } }; -static bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key2) +Q_STATIC_GLOBAL_OPERATOR bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key2) { return key1.pattern == key2.pattern && key1.patternSyntax == key2.patternSyntax && key1.cs == key2.cs; -- cgit v0.12