diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:08:16 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:08:16 +0100 |
| commit | 652e3bfcefab674be3caa5062f4d1cf9634b9ef2 (patch) | |
| tree | 539292ea832874f4e7a5efc39cb284b52d85f5c4 /src/dialogs/qquickabstractfiledialog.cpp | |
| parent | ff2c10d287aa9f9726ceee91543f08ab1f9d0b9c (diff) | |
| parent | 8a223fc04e003d93c63dc3c1786da115dd70c7bd (diff) | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I64e4c4f9ca56b263d8f00d3ba6a1067d78f26065
Diffstat (limited to 'src/dialogs/qquickabstractfiledialog.cpp')
0 files changed, 0 insertions, 0 deletions