diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
| commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
| tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /tests/auto/corelib/text/qstring/tst_qstring.cpp | |
| parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
| parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'tests/auto/corelib/text/qstring/tst_qstring.cpp')
| -rw-r--r-- | tests/auto/corelib/text/qstring/tst_qstring.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp index cce3e601cd..c96210f53d 100644 --- a/tests/auto/corelib/text/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp @@ -4593,6 +4593,8 @@ void tst_QString::fromLatin1() } #if QT_DEPRECATED_SINCE(5, 0) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED void tst_QString::fromAscii() { QString a; @@ -4613,6 +4615,7 @@ void tst_QString::fromAscii() a = QString::fromAscii("\0abcd", 5); QVERIFY(a.size() == 5); } +QT_WARNING_POP #endif void tst_QString::fromUcs4() |