From 5527573a86c465a4e24a9537b5a3c2c37913b5f3 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 24 Nov 2022 14:22:35 +0100
Subject: [PATCH] CppEditor: Proliferate FilePath in
 cppsourceprocessertesthelper.*

Change-Id: I70e454e7cd487c8d678ddfd4dbbfac93cd261474
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/plugins/cppeditor/cppsourceprocessertesthelper.cpp | 6 +++---
 src/plugins/cppeditor/cppsourceprocessertesthelper.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/cppeditor/cppsourceprocessertesthelper.cpp b/src/plugins/cppeditor/cppsourceprocessertesthelper.cpp
index bf166625d31..10d925b42c0 100644
--- a/src/plugins/cppeditor/cppsourceprocessertesthelper.cpp
+++ b/src/plugins/cppeditor/cppsourceprocessertesthelper.cpp
@@ -27,14 +27,14 @@ QString TestIncludePaths::globalIncludePath()
     return QDir::cleanPath(includeBaseDirectory() + QLatin1String("/global"));
 }
 
-QString TestIncludePaths::directoryOfTestFile()
+FilePath TestIncludePaths::directoryOfTestFile()
 {
-    return QDir::cleanPath(includeBaseDirectory() + QLatin1String("/local"));
+    return FilePath::fromString(QDir::cleanPath(includeBaseDirectory())) / "local";
 }
 
 FilePath TestIncludePaths::testFilePath(const QString &fileName)
 {
-    return FilePath::fromString(directoryOfTestFile()) / fileName;
+    return directoryOfTestFile() / fileName;
 }
 
 } // CppEditor::Tests::Internal
diff --git a/src/plugins/cppeditor/cppsourceprocessertesthelper.h b/src/plugins/cppeditor/cppsourceprocessertesthelper.h
index 69f82156b66..4d8c7ac4829 100644
--- a/src/plugins/cppeditor/cppsourceprocessertesthelper.h
+++ b/src/plugins/cppeditor/cppsourceprocessertesthelper.h
@@ -18,7 +18,7 @@ public:
     static QString includeBaseDirectory();
     static QString globalQtCoreIncludePath();
     static QString globalIncludePath();
-    static QString directoryOfTestFile();
+    static Utils::FilePath directoryOfTestFile();
     static Utils::FilePath testFilePath(const QString &fileName = QLatin1String("file.cpp"));
 };