From a80195603e70ca72909269c08bc399fdb9e8cdf3 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 30 Sep 2024 10:41:49 +0200
Subject: [PATCH] ProjectExplorer: Fix test

As of 36dca9eb8c0018b6a3cb802e35a9ce3f36786ef8, .pro files have mime type
"text/prolog".

Change-Id: Id6a39b1ddb83e48caafce993bd0c46a06fc82052
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/projectexplorer/projectmanager.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/plugins/projectexplorer/projectmanager.cpp b/src/plugins/projectexplorer/projectmanager.cpp
index 97acbb006a0..f4be94de57b 100644
--- a/src/plugins/projectexplorer/projectmanager.cpp
+++ b/src/plugins/projectexplorer/projectmanager.cpp
@@ -27,6 +27,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
+#include <utils/mimeutils.h>
 #include <utils/persistentsettings.h>
 #include <utils/qtcassert.h>
 #include <utils/stylehelper.h>
@@ -786,10 +787,15 @@ void ProjectExplorerTest::testSessionSwitch()
         const OpenProjectResult openResult
                 = ProjectExplorerPlugin::openProject(
                     FilePath::fromString(sessionSpec.projectFile.fileName()));
-        if (openResult.errorMessage().contains("text/plain"))
-            QSKIP("This test requires the presence of QmakeProjectManager to be fully functional. "
-                  "Hint: run this test with \"-load QmakeProjectManager\" option.");
-        QVERIFY(openResult);
+        if (!ProjectManager::canOpenProjectForMimeType(
+                Utils::mimeTypeForFile(sessionSpec.projectFile.fileName()))) {
+            QEXPECT_FAIL(
+                nullptr,
+                "This test requires the presence of QmakeProjectManager to be fully functional. "
+                "Hint: run this test with \"-load QmakeProjectManager\" option.",
+                Abort);
+        }
+        QVERIFY2(openResult, qPrintable(openResult.errorMessage()));
         QCOMPARE(openResult.projects().count(), 1);
         QVERIFY(openResult.project());
         QCOMPARE(ProjectManager::projects().count(), 1);