Attempt build fix (1)

src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp

@@ -38,6 +38,7 @@
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/runconfigurationaspects.h>
+#include <projectexplorer/devicesupport/devicekitaspects.h>
 #include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
@@ -241,7 +242,7 @@ void QbsProjectManagerPlugin::initialize()
     connect(m_reparseQbs, &QAction::triggered,
             this, &QbsProjectManagerPlugin::reparseCurrentProject);
 
-    connect(Core::EditorManager::instance(), &Core::EditorManager::openWithVisualStudio, this, [this](const Utils::FilePath &path) {
+    connect(Core::EditorManager::instance(), &Core::EditorManager::openWithVisualStudio, this, [](const Utils::FilePath &path) {
         RunConfiguration* rc = ProjectManager::startupRunConfiguration();
         if (!rc)
             return;
@@ -510,15 +511,19 @@ void QbsProjectManagerPlugin::generateVs2022Project()
     if (!bc)
         return;
 
-    auto commandLine = Utils::CommandLine{QbsSettings::qbsExecutableFilePath()};
+    const IDeviceConstPtr dev = BuildDeviceKitAspect::device(bc->kit());
+    if (!dev)
+        return;
+
+    auto commandLine = Utils::CommandLine{QbsSettings::qbsExecutableFilePath(dev)};
     commandLine.addArg("generate");
     commandLine.addArgs({"-g", "visualstudio2022"});
     commandLine.addArgs(
-        {"-d", QDir::toNativeSeparators((bc->buildDirectory() / "vs2022").toString())});
-    commandLine.addArgs({"-f", QDir::toNativeSeparators(project->projectFilePath().toString())});
-    if (QbsSettings::useCreatorSettingsDirForQbs()) {
+        {"-d", (bc->buildDirectory() / "vs2022").nativePath()});
+    commandLine.addArgs({"-f", project->projectFilePath().nativePath()});
+    if (QbsSettings::useCreatorSettingsDirForQbs(dev)) {
         commandLine.addArgs(
-            {"--settings-dir", QDir::toNativeSeparators(QbsSettings::qbsSettingsBaseDir())});
+            {"--settings-dir", QbsSettings::qbsSettingsBaseDir(dev).nativePath()});
     }
     commandLine.addArg("config:" + QbsBuildConfiguration::buildTypeName(bc->buildType()));