diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-10 13:51:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-10 13:51:40 +0200 |
| commit | 90210d5d9c4029057035019f144212922494ff0a (patch) | |
| tree | 1aacefa57786964d47a200791280ae91c9b825da /tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp | |
| parent | c69a2448ab129d88411a4778f2350dcf971dc623 (diff) | |
| parent | 5231c26a82a7056f98d99643850754d4e1ebe417 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
tests/auto/network/kernel/qnetworkinterface/BLACKLIST
Change-Id: I1e8866c63b54bcd95fc2a044276ee15b7f60e79a
Diffstat (limited to 'tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp')
| -rw-r--r-- | tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp index 4b085d387d..88c0c5055c 100644 --- a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp +++ b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp @@ -51,7 +51,7 @@ #ifdef Q_CC_MSVC #define COMPILER_HAS_STDLIB_INCLUDE(x) 1 #else -#define COMPILER_HAS_STDLIB_INCLUDE(x) QT_HAS_INCLUDE(x) +#define COMPILER_HAS_STDLIB_INCLUDE(x) __has_include(x) #endif #if COMPILER_HAS_STDLIB_INCLUDE(<forward_list>) |