diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-05-12 15:27:30 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-05-12 15:27:30 +0200 |
| commit | 3823b0af5ff928b7520bebfa05b5bcbb72fec0d9 (patch) | |
| tree | b8118f04e6e86f173ffce734cd92cb2f6cfe8fdd /src/plugins/cpptools/builtinindexingsupport.cpp | |
| parent | edf6178896348d34fae3fe465cf577c5b3abb180 (diff) | |
| parent | 0cef9a8554437a7ed7033198dffc5baa647d67e4 (diff) | |
| download | qt-creator-3823b0af5ff928b7520bebfa05b5bcbb72fec0d9.tar.gz | |
Merge remote-tracking branch 'origin/4.15'
Conflicts:
src/libs/languageserverprotocol/workspace.cpp
src/libs/languageserverprotocol/workspace.h
Change-Id: I739ae6642b1e2a505e351903f19df2550ef01629
Diffstat (limited to 'src/plugins/cpptools/builtinindexingsupport.cpp')
0 files changed, 0 insertions, 0 deletions