diff options
Diffstat (limited to 'tests/auto/corelib/io')
| -rw-r--r-- | tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp index 2accf99c9a..519b95e745 100644 --- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp +++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2019 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -57,10 +57,6 @@ private slots: void checkStructure(); void searchPath_data(); void searchPath(); -#if QT_DEPRECATED_SINCE(5, 13) - void searchPath_deprecated_data(); - void searchPath_deprecated(); -#endif void doubleSlashInRoot(); void setLocale(); void lastModified(); @@ -540,48 +536,6 @@ void tst_QResourceEngine::searchPath() qf.close(); } -#if QT_DEPRECATED_SINCE(5, 13) - -void tst_QResourceEngine::searchPath_deprecated_data() -{ - QTest::addColumn<QString>("searchPath"); - QTest::addColumn<QString>("file"); - QTest::addColumn<QByteArray>("expected"); - - QTest::newRow("no_search_path") << QString() - << ":search_file.txt" - << QByteArray("root\n"); - QTest::newRow("path1") << "/searchpath1" - << ":search_file.txt" - << QByteArray("path1\n"); - QTest::newRow("no_search_path2") << QString() - << ":/search_file.txt" - << QByteArray("root\n"); - QTest::newRow("path2") << "/searchpath2" - << ":search_file.txt" - << QByteArray("path2\n"); -} - -void tst_QResourceEngine::searchPath_deprecated() -{ - QFETCH(QString, searchPath); - QFETCH(QString, file); - QFETCH(QByteArray, expected); - - if(!searchPath.isEmpty()) - QDir::addResourceSearchPath(searchPath); - QFile qf(file); - QVERIFY(qf.open(QFile::ReadOnly)); - QByteArray actual = qf.readAll(); - - actual.replace('\r', ""); - - QCOMPARE(actual, expected); - qf.close(); -} - -#endif - void tst_QResourceEngine::checkUnregisterResource_data() { QTest::addColumn<QString>("rcc_file"); |