diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:18:23 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:18:24 +0100 |
| commit | 1757766e9812337c0bddffd267baf04c332efd47 (patch) | |
| tree | 454f4af64fe5c5c0ad5cd3bcf37d7044f1743773 /examples/quick/dialogs/systemdialogs/main.cpp | |
| parent | cf5d13803759e5186d24281d95e941ee3ade54b1 (diff) | |
| parent | fbc0fe81fad9fbc80180503ad439f1db0a698a9e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I66b5bab910b3678985b02224a98552d28ca1b301
Diffstat (limited to 'examples/quick/dialogs/systemdialogs/main.cpp')
0 files changed, 0 insertions, 0 deletions