diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2019-05-13 14:49:05 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2019-05-18 18:48:55 +0200 |
| commit | 046a1b72b47c1b97b6f56831cddeef0226a42006 (patch) | |
| tree | d5fd260fbfe7a1c710bebcde78fd38e8fc0eb0fd /src/corelib/tools | |
| parent | ed19fc05313d338059a34304522d8e3a1932dc03 (diff) | |
Qt 6: unexport QCharRef / QByteRef
They're fully inlined classes.
Change-Id: Id9e5f1a1a0b3d8ee49ba45ad2157ffa38fe265cd
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qbytearray.h | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.h | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 14fcddce7c..d21cb9b363 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -528,7 +528,11 @@ inline void QByteArray::squeeze() } } -class Q_CORE_EXPORT QByteRef { +class +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +Q_CORE_EXPORT +#endif +QByteRef { QByteArray &a; int i; inline QByteRef(QByteArray &array, int idx) diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 9d75b0f357..1abb91eabe 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -1044,8 +1044,11 @@ inline QString QString::fromWCharArray(const wchar_t *string, int size) : fromUcs4(reinterpret_cast<const uint *>(string), size); } - -class Q_CORE_EXPORT QCharRef { +class +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +Q_CORE_EXPORT +#endif +QCharRef { QString &s; int i; inline QCharRef(QString &str, int idx) |