diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-10 09:22:38 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-10 09:22:39 +0100 |
| commit | ffdacff6b0cf068c935e63c0238cbe509f14445c (patch) | |
| tree | 67a3c43d755cf11a88620314b61e52353cbd696a /tests/auto/other | |
| parent | b1945604a78626ed25ad8afe70a64c2eac76a2b4 (diff) | |
| parent | 1e27219968f760501c99f9f744f172d475a57162 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia2441257c23169f8ca6a3933b2371255e1ba64e6
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/compiler/tst_compiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/other/compiler/tst_compiler.cpp b/tests/auto/other/compiler/tst_compiler.cpp index 0410856790..b2b45bb237 100644 --- a/tests/auto/other/compiler/tst_compiler.cpp +++ b/tests/auto/other/compiler/tst_compiler.cpp @@ -693,7 +693,7 @@ QT_WARNING_DISABLE_GCC("-Wunused-local-typedefs") [[noreturn]] void attribute_f1(); void attribute_f2 [[noreturn]] (); # if (defined(__cpp_namespace_attributes) && __cpp_namespace_attributes >= 201411) && __has_cpp_attribute(deprecated) -namespace NS [[deprecated]] { } +namespace [[deprecated]] NS { } # endif #endif |