From 217dfdda7ac9745532c5a1c46de9dce354bed541 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 19 Jul 2021 12:00:16 +0200
Subject: [PATCH] ClangTools: Fix clang-tidy command-line construction

Fixes: QTCREATORBUG-26015
Change-Id: I2850e6efa5b75748599f55e8b9c96757582f5cb4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/cpptools/clangdiagnosticconfig.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/cpptools/clangdiagnosticconfig.cpp b/src/plugins/cpptools/clangdiagnosticconfig.cpp
index 95ba5a7328e..e4ad6ed1140 100644
--- a/src/plugins/cpptools/clangdiagnosticconfig.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfig.cpp
@@ -148,18 +148,18 @@ QString ClangDiagnosticConfig::clangTidyChecksAsJson() const
         return false;
     };
 
+    QString optionString;
     for (auto it = m_tidyChecksOptions.cbegin(); it != m_tidyChecksOptions.cend(); ++it) {
         if (!checkIsEnabled(it.key()))
             continue;
-        QString optionString;
         for (auto optIt = it.value().begin(); optIt != it.value().end(); ++optIt) {
             if (!optionString.isEmpty())
                 optionString += ',';
             optionString += "{key: '" + it.key() + '.' + optIt.key()
                     + "', value: '" + optIt.value() + "'}";
         }
-        jsonString += optionString;
     }
+    jsonString += optionString;
     return jsonString += "]}";
 }