diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-17 18:27:41 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-11 03:41:54 +0100 |
| commit | 79eef021cbd8d9789d3b2a63cca2b04c84a3ae05 (patch) | |
| tree | bfa46be01a382bbc1aa051335946cb43de6b5e4e /src/corelib/tools/qregexp.cpp | |
| parent | 0f569f5900ea4cf3af551c90f79b80fc78dce9bf (diff) | |
Remove Q_STATIC_GLOBALxxx_OPERATOR macros
These macros existed for working around an RVCT compiler bug, but since
we stopped trying to work around it, the macros are no longer necessary.
Change-Id: I76cc88d863b41f74f60cd9975dcc1959778c2740
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/tools/qregexp.cpp')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index b679377fc0..71d897082b 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -45,7 +45,6 @@ #include "qstringlist.h" #include "qstringmatcher.h" #include "qvector.h" -#include "private/qfunctions_p.h" #include <limits.h> #include <algorithm> @@ -877,7 +876,7 @@ struct QRegExpEngineKey } }; -Q_STATIC_GLOBAL_OPERATOR bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key2) +static bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key2) { return key1.pattern == key2.pattern && key1.patternSyntax == key2.patternSyntax && key1.cs == key2.cs; |