diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-23 11:53:32 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-24 05:27:38 +0000 |
| commit | 09a1dd2fd4d76a7a7af64cc147b68fda50c17353 (patch) | |
| tree | d144ddb7faf9d20c3d8f97270698834ab2b7580d /src/corelib/tools/qstring.h | |
| parent | 6f03daa597346fdfaa9d19a210928daaa41173d2 (diff) | |
Mark declaration of QString::compare(QStringRef, Qt::CaseSensitivity) inline.
Fixes MinGW errors:
qstring.h:1597:12: error: 'int QString::compare(const QStringRef&, Qt::CaseSensitivity) const' redeclared without dllimport attribute after being referenced with dll linkage [-Werror]
inline int QString::compare(const QStringRef &s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW
Amends changes 8005fa3524916a56a555f44d4418eb1cd12db645,
4e07ded04c0ca7ea62121786664bb564d0f7974e
Change-Id: I5ec296258a8ea9f38b8a8d7b7d44066b7f103c37
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/tools/qstring.h')
| -rw-r--r-- | src/corelib/tools/qstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 7a30316f25..e223c44b75 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -605,7 +605,7 @@ public: Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW { return -s2.compare(s1, cs); } - int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW; + inline int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW; static int compare(const QString &s1, const QStringRef &s2, Qt::CaseSensitivity = Qt::CaseSensitive) Q_DECL_NOTHROW; |