diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-02-07 14:01:18 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-02-07 23:51:06 +0100 |
| commit | 3568ad58f5e273d60f089a1b2d8c91c9535c8cad (patch) | |
| tree | 36b1b8e8c5a90f21785be571f726bcad154268fb /tests/benchmarks/corelib | |
| parent | f64694647a9a3d54fa5ecdaf2570e8c7404271a6 (diff) | |
Introduce a configure-time check for C++17 filesystem
Various compilers have various fun ways of failing to compile when it
is used so let's check if they will work properly during configure
rather than much later.
Change-Id: Ia93d4b91b3d269b4cab2a5f677c3c89e06b44ce3
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'tests/benchmarks/corelib')
| -rw-r--r-- | tests/benchmarks/corelib/io/qdiriterator/main.cpp | 8 | ||||
| -rw-r--r-- | tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro | 6 |
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 |