diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 14:27:12 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-07 17:45:18 +0200 |
| commit | 563a8d628f6c0d5e0ab2bd3305b020e225fb84ca (patch) | |
| tree | 01abd38848b6f22a19c9cf882015a3909c60c15e /src/corelib/io | |
| parent | 8b7bde6c49e1f254b2fec90c492a41320877c40d (diff) | |
QStandardPaths: purge deprecated API
Since 5.2: enableTestMode(bool)
Change-Id: Ibfd5958b6383491d9297d3f0e815ad4679fb57f5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qstandardpaths.cpp | 9 | ||||
| -rw-r--r-- | src/corelib/io/qstandardpaths.h | 5 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp index d95c9015cc..dff113de1e 100644 --- a/src/corelib/io/qstandardpaths.cpp +++ b/src/corelib/io/qstandardpaths.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -601,13 +601,6 @@ QString QStandardPaths::displayName(StandardLocation type) static bool qsp_testMode = false; -#if QT_DEPRECATED_SINCE(5, 2) -void QStandardPaths::enableTestMode(bool testMode) -{ - qsp_testMode = testMode; -} -#endif - void QStandardPaths::setTestModeEnabled(bool testMode) { qsp_testMode = testMode; diff --git a/src/corelib/io/qstandardpaths.h b/src/corelib/io/qstandardpaths.h index df76d73eae..cd9cb22bd2 100644 --- a/src/corelib/io/qstandardpaths.h +++ b/src/corelib/io/qstandardpaths.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -96,9 +96,6 @@ public: static QString findExecutable(const QString &executableName, const QStringList &paths = QStringList()); -#if QT_DEPRECATED_SINCE(5, 2) - static QT_DEPRECATED void enableTestMode(bool testMode); -#endif static void setTestModeEnabled(bool testMode); static bool isTestModeEnabled(); |