summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io/qresourceengine
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-07-16 14:05:46 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-08-07 17:44:13 +0200
commit5a682b04ce29c6b51336456e0a3a4a4ed0e2dcb1 (patch)
tree4b8147a9031dc1fe41e50d59eec391ce57547afc /tests/auto/corelib/io/qresourceengine
parent7ce27430a7a9e13cd9ea1f851a75d094cd3d769e (diff)
Purge QResource of some deprecated API
Removed isCompressed(), deprecated since 5.15, and (since 5.13) addSearchPath() and searchPath(). Change-Id: I4b6fb8077c02bbe322334e474eaf0a2a7caf0004 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/corelib/io/qresourceengine')
-rw-r--r--tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp48
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");