From 0984b7b0c8d5ef138fc9e6d268d50bb591eff9c1 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 25 Jul 2024 07:41:32 +0200
Subject: [PATCH] Meson: Hide versionNumber() in cpp and make it static

Change-Id: I0132de7b6a7df7dd5d6ae4f1ddef52d5af33729a
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/mesonprojectmanager/mesoninfoparser.h   | 13 -------------
 .../mesonprojectmanager/mesonprojectparser.cpp      | 12 +++++++++++-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser.h b/src/plugins/mesonprojectmanager/mesoninfoparser.h
index d45f2f15f89..f56e4f67af9 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser.h
@@ -5,13 +5,10 @@
 
 #include "buildoptions.h"
 #include "buildoptionsparser.h"
-#include "common.h"
 #include "target.h"
 
 #include <utils/filepath.h>
 
-#include <QVersionNumber>
-
 #include <optional>
 
 namespace MesonProjectManager::Internal::MesonInfoParser {
@@ -123,16 +120,6 @@ struct Result
     Utils::FilePaths buildSystemFiles;
 };
 
-inline QVersionNumber versionNumber(const Utils::FilePath &buildDir)
-{
-    const Utils::FilePath jsonFile = buildDir / Constants::MESON_INFO_DIR / Constants::MESON_INFO;
-    auto obj = load<QJsonObject>(jsonFile.toFSPathString());
-    if (!obj)
-        return {};
-    auto version = obj->value("meson_version").toObject();
-    return {version["major"].toInt(), version["minor"].toInt(), version["patch"].toInt()};
-}
-
 inline Result parse(const Utils::FilePath &buildDir)
 {
     return {TargetParser::targetList(buildDir),
diff --git a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp
index cf4fb33cb02..4e33d04126c 100644
--- a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp
+++ b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp
@@ -307,9 +307,19 @@ bool MesonProjectParser::matchesKit(const KitData &kit)
     return matches;
 }
 
+static QVersionNumber versionNumber(const FilePath &buildDir)
+{
+    const Utils::FilePath jsonFile = buildDir / Constants::MESON_INFO_DIR / Constants::MESON_INFO;
+    auto obj = load<QJsonObject>(jsonFile.toFSPathString());
+    if (!obj)
+        return {};
+    auto version = obj->value("meson_version").toObject();
+    return {version["major"].toInt(), version["minor"].toInt(), version["patch"].toInt()};
+}
+
 bool MesonProjectParser::usesSameMesonVersion(const FilePath &buildPath)
 {
-    auto version = MesonInfoParser::versionNumber(buildPath);
+    auto version = versionNumber(buildPath);
     auto meson = MesonTools::toolById(m_meson, ToolType::Meson);
     return !version.isNull() && meson && version == meson->version();
 }