From 333d30dce5c96a19c93ebca7783dbbd8fbca6530 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 25 Jan 2018 07:12:12 +0100 Subject: [PATCH] ClangRefactoring: Fix compile with Qt5.6/gcc4.9 Change-Id: Ibea187c2216cc9f0a3c6ce53d5139b0a2c7c9065 Reviewed-by: Ivan Donchevskii --- src/plugins/clangrefactoring/symbolquery.h | 2 +- src/plugins/clangrefactoring/symbolsfindfilter.cpp | 2 +- src/plugins/cpptools/symbolsfindfilter.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/clangrefactoring/symbolquery.h b/src/plugins/clangrefactoring/symbolquery.h index 324ec976368..96e9af891f4 100644 --- a/src/plugins/clangrefactoring/symbolquery.h +++ b/src/plugins/clangrefactoring/symbolquery.h @@ -75,7 +75,7 @@ public: utf8Column); } - Symbols symbolsContaining(SymbolType symbolType, + Symbols symbolsContaining(SymbolType /*symbolType*/, Utils::SmallStringView/*regularExpression*/) const override { // TODO: implement diff --git a/src/plugins/clangrefactoring/symbolsfindfilter.cpp b/src/plugins/clangrefactoring/symbolsfindfilter.cpp index d6126826cb2..f043c612bce 100644 --- a/src/plugins/clangrefactoring/symbolsfindfilter.cpp +++ b/src/plugins/clangrefactoring/symbolsfindfilter.cpp @@ -44,7 +44,7 @@ QString SymbolsFindFilter::id() const QString SymbolsFindFilter::displayName() const { - return CppTools::Constants::SYMBOLS_FIND_FILTER_DISPLAY_NAME; + return QString(CppTools::Constants::SYMBOLS_FIND_FILTER_DISPLAY_NAME); } bool SymbolsFindFilter::isEnabled() const diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp index 265a20ac7da..0afd65db18c 100644 --- a/src/plugins/cpptools/symbolsfindfilter.cpp +++ b/src/plugins/cpptools/symbolsfindfilter.cpp @@ -74,7 +74,7 @@ QString SymbolsFindFilter::id() const QString SymbolsFindFilter::displayName() const { - return Constants::SYMBOLS_FIND_FILTER_DISPLAY_NAME; + return QString(Constants::SYMBOLS_FIND_FILTER_DISPLAY_NAME); } bool SymbolsFindFilter::isEnabled() const