diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-08-12 13:16:27 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-08-20 00:58:13 +0200 |
| commit | 2766322de37adba37e0d0d4b0054e55edff01c6c (patch) | |
| tree | d487d502ee944963e103e11c9726c3efcd8fe041 /tests/auto/corelib/io | |
| parent | eb7d1cf098df56f8ebf62f02af611a627435a4a1 (diff) | |
Move QStringRef and remains to Qt5Compat
Export some private functions from QUtf8 to resolve
undefined symbols in Qt5Compat after moving QStringRef.
Task-number: QTBUG-84437
Change-Id: I9046dcb14ed520d8868a511d79da6e721e26f72b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/corelib/io')
| -rw-r--r-- | tests/auto/corelib/io/qdebug/tst_qdebug.cpp | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp index 0b54f53517..3dbda13643 100644 --- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp +++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp @@ -66,7 +66,6 @@ private slots: void veryLongWarningMessage() const; void qDebugQChar() const; void qDebugQString() const; - void qDebugQStringRef() const; void qDebugQStringView() const; void qDebugQLatin1String() const; void qDebugQByteArray() const; @@ -438,7 +437,7 @@ void tst_QDebug::qDebugQString() const QString file, function; int line = 0; const QString in(QLatin1String("input")); - const QStringRef inRef(&in); + const QStringView inRef{ in }; MessageHandlerSetter mhs(myMessageHandler); { qDebug() << inRef; } @@ -509,47 +508,6 @@ void tst_QDebug::qDebugQString() const QCOMPARE(s_msg, QString("\"\\uDC00\\uD800x\\uD800\"")); } -void tst_QDebug::qDebugQStringRef() const -{ - /* Use a basic string. */ - { - QString file, function; - int line = 0; - const QString in(QLatin1String("input")); - const QStringRef inRef(&in); - - MessageHandlerSetter mhs(myMessageHandler); - { qDebug() << inRef; } -#ifndef QT_NO_MESSAGELOGCONTEXT - file = __FILE__; line = __LINE__ - 2; function = Q_FUNC_INFO; -#endif - QCOMPARE(s_msgType, QtDebugMsg); - QCOMPARE(s_msg, QString::fromLatin1("\"input\"")); - QCOMPARE(QString::fromLatin1(s_file), file); - QCOMPARE(s_line, line); - QCOMPARE(QString::fromLatin1(s_function), function); - } - - /* Use a null QStringRef. */ - { - QString file, function; - int line = 0; - - const QStringRef inRef; - - MessageHandlerSetter mhs(myMessageHandler); - { qDebug() << inRef; } -#ifndef QT_NO_MESSAGELOGCONTEXT - file = __FILE__; line = __LINE__ - 2; function = Q_FUNC_INFO; -#endif - QCOMPARE(s_msgType, QtDebugMsg); - QCOMPARE(s_msg, QString::fromLatin1("\"\"")); - QCOMPARE(QString::fromLatin1(s_file), file); - QCOMPARE(s_line, line); - QCOMPARE(QString::fromLatin1(s_function), function); - } -} - void tst_QDebug::qDebugQStringView() const { /* Use a basic string. */ |