diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:08:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:12:27 +0200 |
| commit | e7b022ec334ce6768c30402c1e17fe0a1e3a0bb0 (patch) | |
| tree | 72641f2dc53522ca1959ac8c1d06692303c3a17b /tests/auto/cpptest/cpptest.pro | |
| parent | 5adf257bebf2df7f54b92fb724cd547dc58a1163 (diff) | |
| parent | 73ec35fa12a4b150670ea93d3021ca8e658063e1 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ibb41c2bb83df7e02696e27afe62e94ed059284ae
Diffstat (limited to 'tests/auto/cpptest/cpptest.pro')
0 files changed, 0 insertions, 0 deletions