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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
This commit is contained in:
Eike Ziller
2017-10-25 16:07:21 +02:00
parent 81f5c1c8ec dd60923713
commit 7f626b1182
108 changed files with 964 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangrefactoring/clangqueryprojectsfindfilter.h
View File

@@ -50,6 +50,8 @@ class SearchInterface;
class ClangQueryProjectsFindFilter : public Core::IFindFilter
{
Q_OBJECT
public:
ClangQueryProjectsFindFilter(ClangBackEnd::RefactoringServerInterface &server,
SearchInterface &searchInterface,

80
src/plugins/clangrefactoring/clangrefactoring.qbs Normal file
View File

@@ -0,0 +1,80 @@
import qbs
import qbs.FileInfo
QtcPlugin {
name: "ClangRefactoring"
Depends { name: "libclang"; required: false }
condition: libclang.present && libclang.toolingEnabled
Depends { name: "ClangSupport" }
Depends { name: "Utils" }
Depends { name: "ClangPchManager" }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
cpp.defines: {
var defines = base;
defines.push("CLANGPCHMANAGER_LIB");
// The following defines are used to determine the clang include path for intrinsics.
defines.push('CLANG_VERSION="' + libclang.llvmVersion + '"');
var resourceDir = FileInfo.joinPaths(libclang.llvmLibDir, "clang", libclang.llvmVersion,
"include");
defines.push('CLANG_RESOURCE_DIR="' + resourceDir + '"');
return defines;
}
cpp.includePaths: ["."]
files: [
"baseclangquerytexteditorwidget.cpp",
"baseclangquerytexteditorwidget.h",
"clangqueryexamplehighlighter.cpp",
"clangqueryexamplehighlighter.h",
"clangqueryexamplehighlightmarker.h",
"clangqueryexampletexteditorwidget.cpp",
"clangqueryexampletexteditorwidget.h",
"clangqueryhighlighter.cpp",
"clangqueryhighlighter.h",
"clangqueryhighlightmarker.h",
"clangqueryhoverhandler.cpp",
"clangqueryhoverhandler.h",
"clangqueryprojectsfindfilter.cpp",
"clangqueryprojectsfindfilter.h",
"clangqueryprojectsfindfilter.ui",
"clangqueryprojectsfindfilterwidget.cpp",
"clangqueryprojectsfindfilterwidget.h",
"clangquerytexteditorwidget.cpp",
"clangquerytexteditorwidget.h",
"clangrefactoringplugin.cpp",
"clangrefactoringplugin.h",
"projectpartutilities.cpp",
"projectpartutilities.h",
"qtcreatorclangqueryfindfilter.cpp",
"qtcreatorclangqueryfindfilter.h",
"qtcreatorsearch.cpp",
"qtcreatorsearch.h",
"qtcreatorsearchhandle.cpp",
"qtcreatorsearchhandle.h",
"querysqlitestatementfactory.h",
"refactoringclient.cpp",
"refactoringclient.h",
"refactoringconnectionclient.cpp",
"refactoringconnectionclient.h",
"refactoringengine.cpp",
"refactoringengine.h",
"refactoringprojectupdater.cpp",
"refactoringprojectupdater.h",
"searchhandle.cpp",
"searchhandle.h",
"searchinterface.cpp",
"searchinterface.h",
"sourcelocations.h",
"symbolquery.cpp",
"symbolquery.h",
]
}