diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-02-24 11:42:13 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-02-24 11:42:57 +0100 |
| commit | 41538832c36748068a514c11d0a3be7dcdea77ad (patch) | |
| tree | cc0840d8afb41c0c89c358a572f25e8e44054917 /src/plugins/languageclient/languageclientfunctionhint.cpp | |
| parent | f1e973de794e2e11f1eb92d6fa4dbad1bee1429c (diff) | |
| parent | 0ce098ed878b72e4157449fb762b2d70205f3608 (diff) | |
| download | qt-creator-41538832c36748068a514c11d0a3be7dcdea77ad.tar.gz | |
Merge remote-tracking branch 'origin/7.0'
Conflicts:
src/libs/utils/qtcprocess.cpp
src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
Change-Id: Id0c31719e46d1c44770ea89663eee321a0517ff4
Diffstat (limited to 'src/plugins/languageclient/languageclientfunctionhint.cpp')
0 files changed, 0 insertions, 0 deletions