diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-24 20:37:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-24 20:37:33 +0100 |
| commit | 487844fc62bdf048224d6fc3b7eaae6347d4457b (patch) | |
| tree | 763dc03ad77fd5b43ef74e817423540caa015e4b /src/corelib/tools | |
| parent | 4ed048dded34dbe2ce2842f0d40d9f54cd7571b0 (diff) | |
| parent | 6cacd19db56b632964c3b2453bc273dac50446c9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I13c7ea6a74eb98606cf45702ae068101943bec6a
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qbytearray.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 19c1f25bc7..a53d4eabd3 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -337,7 +337,7 @@ public: QT_ASCII_CAST_WARN int indexOf(const QString &s, int from = 0) const; QT_ASCII_CAST_WARN int lastIndexOf(const QString &s, int from = -1) const; #endif -#ifndef QT_NO_CAST_FROM_ASCII +#if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) inline QT_ASCII_CAST_WARN bool operator==(const QString &s2) const; inline QT_ASCII_CAST_WARN bool operator!=(const QString &s2) const; inline QT_ASCII_CAST_WARN bool operator<(const QString &s2) const; |