diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:43:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:00:32 +0100 |
| commit | ee68813c81d5c3d40af6d362f851d54099bf86f6 (patch) | |
| tree | 5c32da456e4a041dc71168ac5d30ea586cd8dcca /tests/manual/itemmodeltest/main.cpp | |
| parent | 0565aadd971adb0fa0c09b6f9d04cc1cef1b12fd (diff) | |
| parent | 32fc1c7d360fe2eff44666fb1a8c4fb7d538ddc7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: Ibd0e0140e7055c7819a65e661a96095648de6fcd
Diffstat (limited to 'tests/manual/itemmodeltest/main.cpp')
0 files changed, 0 insertions, 0 deletions