diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-06 14:52:45 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-16 23:14:57 +0200 |
| commit | 83f5c3c26a59849197bd8d3a661afc87893866ba (patch) | |
| tree | 9dbd6b25e0397828f5a9f123fd67ffc8fc827dd1 /tests/auto/corelib/text/qstring | |
| parent | ea7cc7f6f95030c38d86c4430ac8ee4386099d6b (diff) | |
Remove QString::from/toAscii()
These methods have been deprecated since 5.0
Change-Id: I3ceed57a364ea59a63ccc51452ab3b4da7140ce4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/corelib/text/qstring')
| -rw-r--r-- | tests/auto/corelib/text/qstring/tst_qstring.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp index bfecbf2b4b..2e7b0fb1ed 100644 --- a/tests/auto/corelib/text/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp @@ -522,9 +522,6 @@ private slots: void stringRef_local8Bit_data(); void stringRef_local8Bit(); void fromLatin1(); -#if QT_DEPRECATED_SINCE(5, 0) - void fromAscii(); -#endif void fromUcs4(); void toUcs4(); void arg(); @@ -4612,32 +4609,6 @@ void tst_QString::fromLatin1() QVERIFY(a.size() == 5); } -#if QT_DEPRECATED_SINCE(5, 0) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -void tst_QString::fromAscii() -{ - QString a; - a = QString::fromAscii( 0 ); - QVERIFY( a.isNull() ); - QVERIFY( a.isEmpty() ); - a = QString::fromAscii( "" ); - QVERIFY( !a.isNull() ); - QVERIFY( a.isEmpty() ); - - a = QString::fromAscii(0, 0); - QVERIFY(a.isNull()); - a = QString::fromAscii(0, 5); - QVERIFY(a.isNull()); - a = QString::fromAscii("\0abcd", 0); - QVERIFY(!a.isNull()); - QVERIFY(a.isEmpty()); - a = QString::fromAscii("\0abcd", 5); - QVERIFY(a.size() == 5); -} -QT_WARNING_POP -#endif - void tst_QString::fromUcs4() { const uint *null = 0; |