diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-26 14:10:14 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-26 14:13:35 +0200 |
| commit | 11b066beb45e7da084c6f792cf9421d48d4b40bf (patch) | |
| tree | 0a27017508682b812b9fa533a3cab95aeb3c33c6 /src/imports/controls/Frame.qml | |
| parent | f1eef22d0d1ddcc2ee48e45e522788eb97f429b0 (diff) | |
| parent | d1efdcd2beac4d40d06ac7258b4d84e4376ab9d6 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
examples/quickcontrols2/gallery/gallery.qrc
src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
src/quicktemplates2/qquickstackview_p.cpp
src/quicktemplates2/qquickstackview_p_p.h
tests/auto/controls/data/tst_stackview.qml
Change-Id: If451fe0e5653572d305b4de90a6d5cb878463e8d
Diffstat (limited to 'src/imports/controls/Frame.qml')
0 files changed, 0 insertions, 0 deletions