diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-07-16 12:48:19 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-07-16 12:48:19 +0200 |
| commit | 13e8a9a13682ad8502ae8053f26a014d66570bf8 (patch) | |
| tree | 9d1ae9bb06e8340aa2a75c2d427ab42045e1dabb /src/plugins/cpptools/cpptoolsunittestfiles.pri | |
| parent | 7e747e25bbc4639398dde627373184c5448e6bc2 (diff) | |
| parent | 842770b6b57d1326b23a83e99451ad4a3cde5f74 (diff) | |
| download | qt-creator-13e8a9a13682ad8502ae8053f26a014d66570bf8.tar.gz | |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: I5dd6bd7d7e71c84a43b33c0aded673f3c4a57ef8
Diffstat (limited to 'src/plugins/cpptools/cpptoolsunittestfiles.pri')
0 files changed, 0 insertions, 0 deletions