diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:28:09 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:28:09 +0200 |
| commit | cb6ccf9fee26c5a2b7f3946b7ffc05430b7be3ff (patch) | |
| tree | 6de74ca46c389328696831bcc74cd5aff6756fee /examples/quick/controls/filesystembrowser/main.qml | |
| parent | ded73ee2ae8aa333894ab11ce2297e755ec03f3e (diff) | |
| parent | de9145dcd904068256e28e130fdfda2e8014efe8 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/controls/qquickmenupopupwindow_p.h
Change-Id: Ic935bb56f5df70645eea30c890759f5980d68fe4
Diffstat (limited to 'examples/quick/controls/filesystembrowser/main.qml')
0 files changed, 0 insertions, 0 deletions