Apply Q_CONSTINIT across the codebase

Still not complete. Just grepping for static and thread_local.

Task-number: QTBUG-100486
Change-Id: I90ca14e8db3a95590ecde5f89924cf6fcc9755a3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index a18eb076bd..16210e8b2e 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -336,14 +336,12 @@ static QString vcCommandSeparator()
     // of the custom commands into it, and putting an "if errorlevel goto" statement behind it.
     // As we want every sub-command to be error-checked (as is done by makefile-based
     // backends), we insert the checks ourselves, using the undocumented jump target.
-    static QString cmdSep =
-    QLatin1String("
if errorlevel 1 goto VCReportError
");
-    return cmdSep;
+    return QStringLiteral("
if errorlevel 1 goto VCReportError
");
 }
 
 static void unknownOptionWarning(const char *tool, const char *option)
 {
-    static bool firstCall = true;
+    Q_CONSTINIT static bool firstCall = true;
     warn_msg(WarnLogic, "Could not parse %s option '%s'; added to AdditionalOptions.", tool, option);
     if (firstCall) {
         firstCall = false;