diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 16:20:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 16:20:45 +0100 |
| commit | fe1b0c6f1c5f34f67699b67c0d0393f2675c9eaf (patch) | |
| tree | 0daa32f9881784c6ab3b1ba99d166b33adf861c8 /examples/quick/dialogs/systemdialogs/FileDialogs.qml | |
| parent | fff5ad57fc2ae90a519c4864f7d05968c68d08f4 (diff) | |
| parent | 7eb12f65dc8f0a703f696a710d5db802488e1e31 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
examples/quick/extras/gallery/qml/PieMenuDefaultStyle.qml
Change-Id: I87f52fa9bdde0d74bfb3a9844c01fadab7a2e3e2
Diffstat (limited to 'examples/quick/dialogs/systemdialogs/FileDialogs.qml')
0 files changed, 0 insertions, 0 deletions