diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-17 16:07:10 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-23 16:57:03 +0200 |
| commit | 298e41b830f60c0f2f078996ace77a4254a9f335 (patch) | |
| tree | 4bf6029da36fb143aeeb11c04a2bdf442ef56b42 /tests/manual/filetest/main.cpp | |
| parent | e5d65996a93bbf4cbc8a155887def6efa3ad73de (diff) | |
Remove fatuously true or false QT_VERSION checks
QT_VERSION is now at least QT_VERSION_CHECK(6, 3, 0), so remove all
checks against Qt 6.0.0 or earlier. They are superfluous. Tidied up in
some places in the process, particularly #include order.
Change-Id: I2636b2fd13be5b976f5b043ef2f8cddc038a72a4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/manual/filetest/main.cpp')
| -rw-r--r-- | tests/manual/filetest/main.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/manual/filetest/main.cpp b/tests/manual/filetest/main.cpp index 290dc7064ee..7a195998580 100644 --- a/tests/manual/filetest/main.cpp +++ b/tests/manual/filetest/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -196,10 +196,6 @@ static int rm(const char *fileName) static int rmr(const char *dirName) { -#if QT_VERSION < 0x050000 - Q_UNUSED(dirName); - return 1; -#else QDir dir(QString::fromLocal8Bit(dirName)); if (!dir.removeRecursively()) { qWarning().nospace() << "Failed to remove " << dir.absolutePath(); @@ -207,7 +203,6 @@ static int rmr(const char *dirName) } return 0; -#endif } int main(int argc, char *argv[]) |