diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-14 14:09:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-14 14:09:22 +0200 |
| commit | 70d02504f7215d46d8244f84a8192609c53c8b63 (patch) | |
| tree | 3c083c3788263ada30fbe2e7b3432f1c3ae76747 /examples/quickcontrols/controls/filesystembrowser/main.cpp | |
| parent | 59264fc24e3806a7e43379a2b8c610148f89cccb (diff) | |
| parent | 7f61a351148c7d67f8f4ee6f2d2c4a9c53766297 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
tests/auto/extras/data/tst_tumbler.qml
Change-Id: Ia8b373767a311e973e3b171109b6b8b6c33f82b0
Diffstat (limited to 'examples/quickcontrols/controls/filesystembrowser/main.cpp')
0 files changed, 0 insertions, 0 deletions