diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:22:59 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:22:59 (GMT) |
| commit | 9093368f33ddc422047103a89effcd40338b4dbc (patch) | |
| tree | 78c9660b403214de7ba793c9b06bbb0b65cd5eac /src/corelib/tools/qregexp.cpp | |
| parent | 5365c1cdf1e79b60f913f8fba2b5a25058d65b5c (diff) | |
| parent | 1af6fc12def29e3f44dd7fcf5635c688902f29c8 (diff) | |
| download | Qt-9093368f33ddc422047103a89effcd40338b4dbc.zip Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.gz Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/tools/qregexp.cpp')
| -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 ed7fe9e..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 } }; -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; |