diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 19:04:30 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 19:04:30 +0100 |
| commit | 67041bbc667a10ae14a15ed8755b2b1bbf91b686 (patch) | |
| tree | 5e60cba6d8782dddaf82a4281e8ea065e89714ac /src/controls/qquickpopupwindow.cpp | |
| parent | d9445e92d2f4395d1f80185fb43da54f87811298 (diff) | |
| parent | 24f7b001be872982bc675bf065419f1bcc76f87b (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I196db88d242bc270c21282d152b949d737232650
Diffstat (limited to 'src/controls/qquickpopupwindow.cpp')
0 files changed, 0 insertions, 0 deletions