Merge remote-tracking branch 'origin/12.0'

Change-Id: I7971dd83798e975d4e10b77a352c9d7ef7b14ec0

src/plugins/python/pyside.cpp

@@ -89,8 +89,8 @@ void PySideInstaller::installPyside(const FilePath &python,
     const Utils::QtcSettings *settings = Core::ICore::settings(QSettings::SystemScope);
 
     const FilePaths requirementsList
-        = Utils::transform(settings->value("Python/PySideWheelsRequirements").toList(),
-                           &FilePath::fromSettings);
+        = Utils::transform(settings->value("Python/PySideWheelsRequirements").toStringList(),
+                           &FilePath::fromString);
     for (const FilePath &requirements : requirementsList) {
         if (requirements.exists()) {
             auto version = QVersionNumber::fromString(requirements.parentDir().fileName());

src/plugins/python/pythonwizardpage.h

@@ -1,6 +1,8 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#pragma once
+
 #include <projectexplorer/jsonwizard/jsonwizard.h>
 #include <projectexplorer/jsonwizard/jsonwizardpagefactory.h>
 #include <projectexplorer/runconfigurationaspects.h>