diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-05 15:37:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-05 15:37:50 +0200 |
| commit | deee7b7eced5b240e3161d655319dbaaf2f8965c (patch) | |
| tree | 4ad6db0e97482c24f02f111cbfeec224535feb73 /src/testlib/qtest.h | |
| parent | bcd4b14026094d0077ad1069054676cc6da96251 (diff) | |
| parent | 6ad08b9cad4efefc72e64deaa0b720a3aab0fa54 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
qmake/generators/makefile.cpp
Change-Id: Ifb2633a69d0bf8cdf12d799c6259beefc279c49e
Diffstat (limited to 'src/testlib/qtest.h')
0 files changed, 0 insertions, 0 deletions