diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:22:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:22:01 +0200 |
| commit | fd61bbad4be0b9e839f882f9681f0732d2bbce38 (patch) | |
| tree | 9938d32f33f380b8a53b37e568c7a74f665a1b28 /config.tests | |
| parent | 4e25236729caf1947ddcdfb51f17252ff863d9bf (diff) | |
| parent | 167f91bebe2ee53fcd13d843dc9e0aad80b92d82 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: Ia6897047e8baf34681acf9512978d26dc00b37c5
Diffstat (limited to 'config.tests')
0 files changed, 0 insertions, 0 deletions