2 files changed, 7 insertions, 7 deletions
diff --git a/tests/benchmarks/corelib/io/qdiriterator/main.cpp b/tests/benchmarks/corelib/io/qdiriterator/main.cpp
index 60c75ead4d..5b10a4a689 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/main.cpp
+++ b/tests/benchmarks/corelib/io/qdiriterator/main.cpp
@@ -44,11 +44,7 @@
 
 #include "qfilesystemiterator.h"
 
-#if QT_HAS_INCLUDE(<filesystem>) && defined(__cpp_lib_filesystem) && __cpp_lib_filesystem >= 201703L
-#define HAS_STD_FILESYSTEM
-#endif
-
-#ifdef HAS_STD_FILESYSTEM
+#if QT_CONFIG(cxx17_filesystem)
 #include <filesystem>
 #endif
 
@@ -248,7 +244,7 @@ void tst_qdiriterator::fsiterator()
 
 void tst_qdiriterator::stdRecursiveDirectoryIterator()
 {
-#ifdef HAS_STD_FILESYSTEM
+#if QT_CONFIG(cxx17_filesystem)
     QFETCH(QByteArray, dirpath);
 
     int count = 0;
diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro
index 4b28946f18..609a578321 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro
+++ b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro
@@ -4,7 +4,11 @@ QT = core testlib
 
 CONFIG += release
 # Enable c++17 support for std::filesystem
-qtConfig(c++1z): CONFIG += c++17
+qtConfig(cxx17_filesystem) {
+    CONFIG += c++17
+    gcc:lessThan(QMAKE_GCC_MAJOR_VERSION, 9): \
+        QMAKE_LFLAGS += -lstdc++fs
+}
 
 SOURCES += main.cpp qfilesystemiterator.cpp
 HEADERS += qfilesystemiterator.h