diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 17:58:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:19:44 +0100 |
| commit | 50578d3893c611b3a33bbd8239a126f2b8f234b1 (patch) | |
| tree | 16e344775d7b25f22b38c20c42d68e9d52817782 /tools/testcon/invokemethod.ui | |
| parent | 851309bd2987b451354780e36112c02d5473482d (diff) | |
| parent | 15c9ffc20f205e32b9297249be944bcbedd84fc7 (diff) | |
| download | qtactiveqt-5.10.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
.qmake.conf
Change-Id: Ibeb74b560f39f3b6b48344873c87aba3a4af8a2c
Diffstat (limited to 'tools/testcon/invokemethod.ui')
0 files changed, 0 insertions, 0 deletions