diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-20 17:00:09 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-20 17:00:09 (GMT) |
| commit | ef1335b1ab76fb3ee1082b5abab66b43fa45df1d (patch) | |
| tree | c11d9aa8cd2838a01d71e06fbf448a892f326006 /src/corelib | |
| parent | 79a5babcd2fdee3aca7fb6b13d9eddd2ec130581 (diff) | |
| download | Qt-ef1335b1ab76fb3ee1082b5abab66b43fa45df1d.zip Qt-ef1335b1ab76fb3ee1082b5abab66b43fa45df1d.tar.gz Qt-ef1335b1ab76fb3ee1082b5abab66b43fa45df1d.tar.bz2 | |
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
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 <limits.h> @@ -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; |