Merge remote-tracking branch 'origin/13.0'

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: I2a3d92a14e4dd16897d19f7d8a8c7b0ec30d14a5

1 files changed, 2 insertions, 1 deletions

diff --git a/src/plugins/projectexplorer/projectmanager.cpp b/src/plugins/projectexplorer/projectmanager.cpp
index fe1e69aac0..e0cb5e2ca5 100644
--- a/src/plugins/projectexplorer/projectmanager.cpp
+++ b/src/plugins/projectexplorer/projectmanager.cpp
@@ -740,7 +740,8 @@ void ProjectExplorerTest::testSessionSwitch()
                 = 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");
+            QSKIP("This test requires the presence of QmakeProjectManager to be fully functional. "
+                  "Hint: run this test with \"-load QmakeProjectManager\" option.");
         QVERIFY(openResult);
         QCOMPARE(openResult.projects().count(), 1);
         QVERIFY(openResult.project());