From a793fe647947189be4c549adfacf9262f992a299 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 21 Jul 2022 08:07:59 +0200
Subject: [PATCH] Qnx: Pass SDP environment to gdb

Change-Id: I96323671176112c3295aa5ecddaf538ea645e92a
Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>
---
 src/plugins/qnx/qnxdebugsupport.cpp | 4 +++-
 src/plugins/qnx/qnxqtversion.h      | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index bb104961e7e..ae452b36c64 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -147,8 +147,10 @@ QnxDebugSupport::QnxDebugSupport(RunControl *runControl)
     setCloseMode(KillAtClose);
     setUseCtrlCStub(true);
     setSolibSearchPath(searchPaths(k));
-    if (auto qtVersion = dynamic_cast<QnxQtVersion *>(QtSupport::QtKitAspect::qtVersion(k)))
+    if (auto qtVersion = dynamic_cast<QnxQtVersion *>(QtSupport::QtKitAspect::qtVersion(k))) {
         setSysRoot(qtVersion->qnxTarget());
+        modifyDebuggerEnvironment(qtVersion->environment());
+    }
 }
 
 
diff --git a/src/plugins/qnx/qnxqtversion.h b/src/plugins/qnx/qnxqtversion.h
index c67aaafc971..c75968da9ff 100644
--- a/src/plugins/qnx/qnxqtversion.h
+++ b/src/plugins/qnx/qnxqtversion.h
@@ -66,11 +66,11 @@ public:
     Utils::FilePath sdpPath() const;
     void setSdpPath(const Utils::FilePath &sdpPath);
 
+    Utils::EnvironmentItems environment() const;
+
 private:
     void updateEnvironment() const;
 
-    Utils::EnvironmentItems environment() const;
-
     Utils::FilePath m_sdpPath;
 
     mutable QString m_cpuDir;