summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2017-09-29 12:25:43 +0200
committerhjk <hjk@qt.io>2017-09-29 14:26:36 +0000
commit5baecec6b7faefab6f4483c1ac29b39af442b021 (patch)
tree557748c18bdc9de282c0f0fef561cd8ee2741329
parentaf8cd2b63319707d7ec4e67589ffad75d1872469 (diff)
downloadqt-creator-5baecec6b7faefab6f4483c1ac29b39af442b021.tar.gz
Qnx: Fix C++ debugging
Task-number: QTCREATORBUG-17901 Change-Id: Iab7dfa3eb9a211770e45405f344d75ff20e8acae Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--dist/changes-4.4.1.md2
-rw-r--r--src/plugins/qnx/qnxdebugsupport.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/dist/changes-4.4.1.md b/dist/changes-4.4.1.md
index 8aef45f0ae..9e991cbb1b 100644
--- a/dist/changes-4.4.1.md
+++ b/dist/changes-4.4.1.md
@@ -62,5 +62,5 @@ Android
QNX
-* Fixed debugging (QTCREATORBUG-18804)
+* Fixed debugging (QTCREATORBUG-18804, QTCREATORBUG-17901)
* Fixed QML profiler startup (QTCREATORBUG-18954)
diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index 0f3d527a15..766b55b2e2 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -134,8 +134,10 @@ void QnxDebugSupport::start()
}
auto qtVersion = dynamic_cast<QnxQtVersion *>(QtSupport::QtKitInformation::qtVersion(k));
- if (qtVersion)
+ if (qtVersion) {
params.solibSearchPath = QnxUtils::searchPaths(qtVersion);
+ params.sysRoot = qtVersion->qnxTarget();
+ }
setStartParameters(params);