diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:42:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:43:24 +0100 |
| commit | 4459886e3f949821425dd5fd9fc9da0416d0ffc9 (patch) | |
| tree | 4f456505c2bee66ea49ced2b4d69a2c1b1430c3b /src/extras/plugin.cpp | |
| parent | c053e8aa063fa679b712935cc1495a51f2ddaf6b (diff) | |
| parent | 698a8268f786d74726eb07255df2d26ac2269079 (diff) | |
| download | qtquickcontrols-4459886e3f949821425dd5fd9fc9da0416d0ffc9.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: Id56429b283aff90a18576cbd769b96fa1f0781fa
Diffstat (limited to 'src/extras/plugin.cpp')
0 files changed, 0 insertions, 0 deletions