diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:06:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:06:48 +0100 |
| commit | 87762e57ebc9d5adc8f570c6e555689c7864614b (patch) | |
| tree | 4edab3c877b30f7871b9adcc43298127870f50d5 /examples/quick/dialogs/systemdialogs/doc/src | |
| parent | 788286932ee8307e48ccb81c0574f51c035e7138 (diff) | |
| parent | 70cb1e525c8dd790e9e1f8f2192ecdb2667ac2a1 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ib58b1084fdeb88a19b81f678e8ae2fcce3c8bbf7
Diffstat (limited to 'examples/quick/dialogs/systemdialogs/doc/src')
0 files changed, 0 insertions, 0 deletions