diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 14:05:46 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-07 17:44:13 +0200 |
| commit | 5a682b04ce29c6b51336456e0a3a4a4ed0e2dcb1 (patch) | |
| tree | 4b8147a9031dc1fe41e50d59eec391ce57547afc /src/corelib/io/qresource.h | |
| parent | 7ce27430a7a9e13cd9ea1f851a75d094cd3d769e (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 'src/corelib/io/qresource.h')
| -rw-r--r-- | src/corelib/io/qresource.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h index 52b0d74d29..8f17c1f075 100644 --- a/src/corelib/io/qresource.h +++ b/src/corelib/io/qresource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2019 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -80,17 +80,6 @@ public: QByteArray uncompressedData() const; QDateTime lastModified() const; -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_X("Use QDir::addSearchPath() instead") - static void addSearchPath(const QString &path); - QT_DEPRECATED_X("Use QDir::searchPaths() instead") - static QStringList searchPaths(); -#endif -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_VERSION_X_5_15("Use QResource::compressionAlgorithm() instead") - bool isCompressed() const; -#endif - static bool registerResource(const QString &rccFilename, const QString &resourceRoot=QString()); static bool unregisterResource(const QString &rccFilename, const QString &resourceRoot=QString()); |