diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-23 09:58:37 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-23 09:58:37 +0200 |
| commit | 9884ce9ff65e12d92244d3201b8226503354ae07 (patch) | |
| tree | f0434a169f7d7401507713977f3c91a3b10918d5 /src/quicktemplates2/qquickstackview.cpp | |
| parent | 56cb695c43321ef2c0052f60485db192dfb72225 (diff) | |
| parent | 817372c771910d017735ecdd8d4af03a016e2ba9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickstackview.cpp
tests/auto/controls/data/tst_stackview.qml
Change-Id: I9ff4854be8f3c4a0ab943199ae475f3352147965
Diffstat (limited to 'src/quicktemplates2/qquickstackview.cpp')
0 files changed, 0 insertions, 0 deletions