diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-02 09:49:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-02 09:49:21 +0100 |
| commit | cdd6f78d9330b5dac516ec27edf4c691217119c0 (patch) | |
| tree | 6ce221ba805cc5e309767df0083d8f1723bf4389 /examples/quick/dialogs/systemdialogs/main.cpp | |
| parent | d204d96355f5facf8d01ff75bf035ab0734a4398 (diff) | |
| parent | a3ba1a532f92a933141d4671ce644053a0cb6fea (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/controls/data/tst_menubar.qml
Change-Id: I23c3299e6f6cef14093aa4f79b3e7d769c063064
Diffstat (limited to 'examples/quick/dialogs/systemdialogs/main.cpp')
0 files changed, 0 insertions, 0 deletions