From fa50153fc8f0ec992224007fa4101253d7554fcd Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 18 Sep 2018 10:19:01 +0200 Subject: [PATCH 1/2] Qnx: Fix passing path to Qt libraries on device to run configuration The line edit was gone. Broke in 4b9945c32981105bfae3ba59f9565757f0dc7417 Task-number: QTCREATORBUG-21100 Change-Id: Ib341df783d6b8060226863637c65f081635deaf0 Reviewed-by: hjk --- src/plugins/qnx/qnxrunconfiguration.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp index 19d14cbbbed..9fb568613cf 100644 --- a/src/plugins/qnx/qnxrunconfiguration.cpp +++ b/src/plugins/qnx/qnxrunconfiguration.cpp @@ -39,6 +39,7 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Core::Id id) auto libAspect = new QtLibPathAspect(this); libAspect->setSettingsKey("Qt4ProjectManager.QnxRunConfiguration.QtLibPath"); libAspect->setLabelText(tr("Path to Qt libraries on device")); + libAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay); addExtraAspect(libAspect); } From 9c7d546c14517b1167376fee01e815d31a100475 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Tue, 18 Sep 2018 14:42:20 +0200 Subject: [PATCH 2/2] Clang: Fix possible out of bounds access in ClangFollowSymbol Change-Id: I80132dca9c26a54059f2c1ba872b102df8e6e0d7 Reviewed-by: hjk --- src/plugins/clangcodemodel/clangfollowsymbol.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/clangcodemodel/clangfollowsymbol.cpp b/src/plugins/clangcodemodel/clangfollowsymbol.cpp index f503a777d2a..dab5b52dc63 100644 --- a/src/plugins/clangcodemodel/clangfollowsymbol.cpp +++ b/src/plugins/clangcodemodel/clangfollowsymbol.cpp @@ -85,10 +85,10 @@ static int includePathStartIndex(const QVector } static int includePathEndIndex(const QVector &marks, - int currentIndex) + int currentIndex) { int endIndex = currentIndex + 1; - while (isValidIncludePathToken(marks[endIndex])) + while (endIndex < marks.size() && isValidIncludePathToken(marks[endIndex])) ++endIndex; return endIndex - 1; }