From fb434052771617893bd8a2df67a4316fd09b1a81 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Sun, 3 Oct 2021 23:51:14 +0100
Subject: [PATCH] [Clang][Windows] Fix regression introduced when upgrading to
 C++17

---
 mkspecs/features/common_pre.prf | 1 -
 mkspecs/features/warnings.pri   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf
index 51da47ad4..cb4e0f340 100644
--- a/mkspecs/features/common_pre.prf
+++ b/mkspecs/features/common_pre.prf
@@ -221,7 +221,6 @@ win32:llvm {
         equals(WORD_SIZE,64): QMAKE_CXXFLAGS += --target=x86_64-pc-windows-gnu
     }
     else {
-        CONFIG += c++latest
         QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations
     }
 
diff --git a/mkspecs/features/warnings.pri b/mkspecs/features/warnings.pri
index 6cb721ac3..1524c06a8 100644
--- a/mkspecs/features/warnings.pri
+++ b/mkspecs/features/warnings.pri
@@ -32,7 +32,7 @@ swiftConfig(allowNoisyWarnings) {
 else {
     DEFINES *= QT_NO_DEPRECATED_WARNINGS
     mingw:QMAKE_CXXFLAGS_WARN_ON += -Wno-maybe-uninitialized
-    clang:QMAKE_CXXFLAGS_WARN_ON += -Wno-return-std-move
+    llvm: QMAKE_CXXFLAGS_WARN_ON += -Wno-return-std-move
 }
 
 # clazy - Qt-aware linter