diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:42 +0200 |
| commit | f2c24adbb3e9561bb2f49f9dfa4daf5d5f315f6a (patch) | |
| tree | 97a7cb095ec610b4baa5f567dd9e8eeae256543b /src/controls/doc/src/qtquickcontrolsstyles-tableviewstyle.qdoc | |
| parent | 6ab6f7a1be455d2f56c8f250c349b401056e5580 (diff) | |
| parent | 191a2fe59cbaf7603d502fa764b4737f49422010 (diff) | |
| download | qtquickcontrols-f2c24adbb3e9561bb2f49f9dfa4daf5d5f315f6a.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I542d108313b1d1566875aed2905ed6b92b9288f0
Diffstat (limited to 'src/controls/doc/src/qtquickcontrolsstyles-tableviewstyle.qdoc')
0 files changed, 0 insertions, 0 deletions