diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-08-18 09:48:39 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-08-18 09:48:39 +0200 |
| commit | 6d44c28f0ae73295464ae7acd59f439c327d0f46 (patch) | |
| tree | 6653684ef9806d1a261c65312286638f71287e8a /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | 20a4afaaa4a32cb5fa411d217b1bb1efa33fc2d4 (diff) | |
| parent | 773d0fdcc513b32d3bf0c91f836f8f4461734ff2 (diff) | |
| download | qt-creator-6d44c28f0ae73295464ae7acd59f439c327d0f46.tar.gz | |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
src/libs/utils/qtcprocess.cpp
Change-Id: I1f7419d927e8534dfdcd10db998f97a6efd4d3e4
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
0 files changed, 0 insertions, 0 deletions