diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:02:38 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:18:30 +0200 |
| commit | d1250cc5699932a1450d8940336ac9f69c04cadc (patch) | |
| tree | b62f61d1c266daff1b719003e9b56d246172f965 | |
| parent | 7abc8c2805797b6361af34676ac0484b2682aedf (diff) | |
| parent | 3247a8f30ef1aa26fefc5d8b8f81f35567bf0071 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I7ab861690f72ccc29d146763e02b6ac5b69951ec
0 files changed, 0 insertions, 0 deletions