1 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp
index 773efc0c740..8176b3d17c9 100644
--- a/src/plugins/qnx/qnxtoolchain.cpp
+++ b/src/plugins/qnx/qnxtoolchain.cpp
@@ -3,9 +3,8 @@
 
 #include "qnxtoolchain.h"
 
-#include "qnxconfiguration.h"
-#include "qnxconfigurationmanager.h"
 #include "qnxconstants.h"
+#include "qnxsettingspage.h"
 #include "qnxtr.h"
 #include "qnxutils.h"
 
@@ -54,7 +53,7 @@ static Abis detectTargetAbis(const FilePath &sdpPath)
         const EnvironmentItems environment = QnxUtils::qnxEnvironment(sdpPath);
         for (const EnvironmentItem &item : environment) {
             if (item.name == QLatin1String("QNX_TARGET"))
-                qnxTarget = FilePath::fromString(item.value);
+                qnxTarget = sdpPath.withNewPath(item.value);
         }
     }
 
@@ -222,10 +221,7 @@ Toolchains QnxToolChainFactory::autoDetect(const ToolchainDetector &detector) co
     if (detector.device)
         return {};
 
-    Toolchains tcs;
-    const auto configurations = QnxConfigurationManager::instance()->configurations();
-    for (QnxConfiguration *configuration : configurations)
-        tcs += configuration->autoDetect(detector.alreadyKnown);
+    Toolchains tcs = QnxSettingsPage::autoDetect(detector.alreadyKnown);
     return tcs;
 }