From 79eef021cbd8d9789d3b2a63cca2b04c84a3ae05 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 17 Dec 2014 18:27:41 -0800 Subject: 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 Reviewed-by: Oswald Buddenhagen Reviewed-by: Olivier Goffart --- src/corelib/kernel/qfunctions_p.h | 3 --- src/corelib/tools/qregexp.cpp | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/kernel/qfunctions_p.h b/src/corelib/kernel/qfunctions_p.h index d0623aab6b..1eb7748364 100644 --- a/src/corelib/kernel/qfunctions_p.h +++ b/src/corelib/kernel/qfunctions_p.h @@ -57,8 +57,5 @@ # include "QtCore/qfunctions_winrt.h" #endif -#define Q_STATIC_GLOBAL_OPERATOR static -#define Q_STATIC_GLOBAL_INLINE_OPERATOR static inline - #endif 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 #include @@ -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; -- cgit v1.2.3