diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-02-28 12:39:09 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-02-28 12:39:09 +0100 |
commit | eeaa02bc2726141ff71cc63d7ab4112461adbcd5 (patch) | |
tree | c5b451826704fee90f399b614c4a5d56ca2b660d /src/plugins/clangcodemodel | |
parent | b9e26fcd376e0002e8f24abbd0baa94642025a1b (diff) | |
parent | 04aac85e2623395d4c6ed4d88a5dc1b8a1103649 (diff) |
Merge remote-tracking branch 'origin/4.8' into 4.9
Conflicts:
src/plugins/android/androidbuildapkstep.cpp
Change-Id: Id6dfda480c23706089ab38aa6277cd37599b5167
Diffstat (limited to 'src/plugins/clangcodemodel')
-rw-r--r-- | src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp | 2 | ||||
-rw-r--r-- | src/plugins/clangcodemodel/clangdiagnosticfilter.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp index d00d488586..db34c904d4 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp @@ -86,7 +86,7 @@ static void addFunctionOverloadAssistProposalItem(QList<AssistProposalItemInterf const QString &name) { auto *item = static_cast<ClangAssistProposalItem *>(sameItem); - item->setHasOverloadsWithParameters(true); + item->setHasOverloadsWithParameters(codeCompletion.hasParameters); if (codeCompletion.completionKind == CodeCompletion::ConstructorCompletionKind) { // It's the constructor, currently constructor definitions do not lead here. // CLANG-UPGRADE-CHECK: Can we get here with constructor definition? diff --git a/src/plugins/clangcodemodel/clangdiagnosticfilter.h b/src/plugins/clangcodemodel/clangdiagnosticfilter.h index 0fe164ecf0..a61734718e 100644 --- a/src/plugins/clangcodemodel/clangdiagnosticfilter.h +++ b/src/plugins/clangcodemodel/clangdiagnosticfilter.h @@ -49,7 +49,7 @@ private: void filterFixits(); private: - const QString &m_filePath; + const QString m_filePath; QVector<ClangBackEnd::DiagnosticContainer> m_warningDiagnostics; QVector<ClangBackEnd::DiagnosticContainer> m_errorDiagnostics; |