From e9e8852f50eabf95a9d8006aee3696ed86d9755d Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Tue, 25 Jun 2019 10:03:26 +0200
Subject: [PATCH] CppTools: Handle not only "-std=X" but also "--std=X"

Fixes: QTCREATORBUG-22444
Change-Id: Iedb0b17a26724d0cc8233a3bad273f3e6bd7462d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/cpptools/compileroptionsbuilder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 7d12b33f056..c1cef62c6c3 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -755,7 +755,7 @@ void CompilerOptionsBuilder::evaluateCompilerFlags()
 
         // Check whether a language version is already used.
         QString theOption = option;
-        if (theOption.startsWith("-std=")) {
+        if (theOption.startsWith("-std=") || theOption.startsWith("--std=")) {
             m_compilerFlags.isLanguageVersionSpecified = true;
             theOption.replace("=c18", "=c17");
             theOption.replace("=gnu18", "=gnu17");