feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	src/plugins/qnx/qnxrunconfiguration.cpp

Change-Id: I6069e6a644c6d50c3d2821d51c368129b6957017
This commit is contained in:
Eike Ziller
2018-09-19 08:27:51 +02:00
parent 0137e2ace9 9c7d546c14
commit dd0347d1ee
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangcodemodel/clangfollowsymbol.cpp
View File

@@ -85,10 +85,10 @@ static int includePathStartIndex(const QVector<ClangBackEnd::TokenInfoContainer>
} }
static int includePathEndIndex(const QVector<ClangBackEnd::TokenInfoContainer> &marks, static int includePathEndIndex(const QVector<ClangBackEnd::TokenInfoContainer> &marks,
int currentIndex) int currentIndex)
{ {
int endIndex = currentIndex + 1; int endIndex = currentIndex + 1;
while (isValidIncludePathToken(marks[endIndex])) while (endIndex < marks.size() && isValidIncludePathToken(marks[endIndex]))
++endIndex; ++endIndex;
return endIndex - 1; return endIndex - 1;
} }

1
src/plugins/qnx/qnxrunconfiguration.cpp
View File

@@ -39,6 +39,7 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Core::Id id)
auto libAspect = addAspect<QtLibPathAspect>(); auto libAspect = addAspect<QtLibPathAspect>();
libAspect->setSettingsKey("Qt4ProjectManager.QnxRunConfiguration.QtLibPath"); libAspect->setSettingsKey("Qt4ProjectManager.QnxRunConfiguration.QtLibPath");
libAspect->setLabelText(tr("Path to Qt libraries on device")); libAspect->setLabelText(tr("Path to Qt libraries on device"));
libAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
} }
Runnable QnxRunConfiguration::runnable() const Runnable QnxRunConfiguration::runnable() const