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/gui/text/qcssparser.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/gui/text/qcssparser.cpp')
| -rw-r--r-- | src/gui/text/qcssparser.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index 8c2e40f319..3e4677a85e 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -41,7 +41,6 @@ #include <qfontmetrics.h> #include <qbrush.h> #include <qimagereader.h> -#include "private/qfunctions_p.h" #include <algorithm> @@ -340,18 +339,18 @@ static const QCssKnownValue styleFeatures[NumKnownStyleFeatures - 1] = { }; #if defined(Q_CC_MSVC) && _MSC_VER < 1600 -Q_STATIC_GLOBAL_OPERATOR bool operator<(const QCssKnownValue &prop1, const QCssKnownValue &prop2) +static bool operator<(const QCssKnownValue &prop1, const QCssKnownValue &prop2) { return QString::compare(QString::fromLatin1(prop1.name), QLatin1String(prop2.name), Qt::CaseInsensitive) < 0; } #endif -Q_STATIC_GLOBAL_OPERATOR bool operator<(const QString &name, const QCssKnownValue &prop) +static bool operator<(const QString &name, const QCssKnownValue &prop) { return QString::compare(name, QLatin1String(prop.name), Qt::CaseInsensitive) < 0; } -Q_STATIC_GLOBAL_OPERATOR bool operator<(const QCssKnownValue &prop, const QString &name) +static bool operator<(const QCssKnownValue &prop, const QString &name) { return QString::compare(QLatin1String(prop.name), name, Qt::CaseInsensitive) < 0; } |