Merge remote-tracking branch 'origin/qds-1.59'

Change-Id: I8891e7490a7fd51997a3b57561961f6134be3252

src/plugins/clangrefactoring/CMakeLists.txt

@@ -36,6 +36,6 @@ add_qtc_plugin(ClangRefactoring
     symbol.h
     symbolquery.h
     symbolqueryinterface.h
-    symbolsfindfilter.cpp symbolsfindfilter.h
+    clangsymbolsfindfilter.cpp clangsymbolsfindfilter.h
     symbolsfindfilterconfigwidget.cpp symbolsfindfilterconfigwidget.h
 )

src/plugins/clangrefactoring/clangrefactoring-source.pri

@@ -6,6 +6,7 @@ HEADERS += \
     $$PWD/clangqueryhighlighter.h \
     $$PWD/clangqueryhighlightmarker.h \
     $$PWD/clangqueryprojectsfindfilter.h \
+    $$PWD/clangsymbolsfindfilter.h \
     $$PWD/projectpartutilities.h \
     $$PWD/refactoringclient.h \
     $$PWD/refactoringconnectionclient.h \
@@ -13,7 +14,6 @@ HEADERS += \
     $$PWD/refactoringprojectupdater.h \
     $$PWD/searchinterface.h \
     $$PWD/searchhandle.h \
-    $$PWD/symbolsfindfilter.h \
     $$PWD/symbolqueryinterface.h \
     $$PWD/symbol.h \
     $$PWD/projectpartproviderinterface.h \
@@ -24,11 +24,11 @@ SOURCES += \
     $$PWD/clangqueryexamplehighlighter.cpp \
     $$PWD/clangqueryhighlighter.cpp \
     $$PWD/clangqueryprojectsfindfilter.cpp \
+    $$PWD/clangsymbolsfindfilter.cpp \
     $$PWD/projectpartutilities.cpp \
     $$PWD/refactoringclient.cpp \
     $$PWD/refactoringconnectionclient.cpp \
     $$PWD/refactoringengine.cpp \
     $$PWD/refactoringprojectupdater.cpp \
     $$PWD/searchhandle.cpp \
-    $$PWD/symbolsfindfilter.cpp \
     $$PWD/locatorfilter.cpp

src/plugins/clangrefactoring/clangrefactoring.qbs

@@ -73,8 +73,8 @@ QtcPlugin {
         "symbol.h",
         "symbolquery.h",
         "symbolqueryinterface.h",
-        "symbolsfindfilter.cpp",
-        "symbolsfindfilter.h",
+        "clangsymbolsfindfilter.cpp",
+        "clangsymbolsfindfilter.h",
         "symbolsfindfilterconfigwidget.cpp",
         "symbolsfindfilterconfigwidget.h",
     ]

src/plugins/clangrefactoring/clangsymbolsfindfilter.cpp

@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "symbolsfindfilter.h"
+#include "clangsymbolsfindfilter.h"
 
 #include <cpptools/cpptoolsconstants.h>
 

src/plugins/clangrefactoring/qtcreatorsymbolsfindfilter.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "symbolsfindfilter.h"
+#include "clangsymbolsfindfilter.h"
 
 namespace ClangRefactoring {
 

src/plugins/clangrefactoring/symbolsfindfilterconfigwidget.cpp

@@ -26,7 +26,7 @@
 
 #include "symbolsfindfilterconfigwidget.h"
 
-#include "symbolsfindfilter.h"
+#include "clangsymbolsfindfilter.h"
 
 namespace ClangRefactoring {