From f85f5b35bb77bab327b3e4cfd1b9a58f1a26d499 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 26 Aug 2024 13:43:52 +0200 Subject: [PATCH] qhashfunctions.h: unindent include Qt will at some point require C++20 and then the indented include will have to be un-indented, anyway, so might was well do it now to have less work later. Also sort the header in with the other C++ headers. Amends 52abff8cc1741412c3fa2c9f6d5185cf48f9ef13. Found in API-review. Change-Id: Ic092d3c0d47e9ecab0492d533b6a10c2a8227e88 Reviewed-by: Ahmad Samir Reviewed-by: Thiago Macieira (cherry picked from commit 3ac48281d9971998882612a43cbcf923104ee592) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/tools/qhashfunctions.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/corelib/tools/qhashfunctions.h b/src/corelib/tools/qhashfunctions.h index 273a211a990..3a72dd47acc 100644 --- a/src/corelib/tools/qhashfunctions.h +++ b/src/corelib/tools/qhashfunctions.h @@ -9,14 +9,13 @@ #include #include +#ifdef __cpp_concepts +#include +#endif #include // for std::accumulate #include // for std::hash #include // For std::pair -#ifdef __cpp_concepts -# include -#endif - #if 0 #pragma qt_class(QHashFunctions) #endif