diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-20 07:30:41 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-20 07:36:55 +0100 |
| commit | 7116f3959c9ade06397de9df66d66667a1a703fe (patch) | |
| tree | 2b5eae5581d1d8750ece6195f9d7b337ccc32130 /examples | |
| parent | d475ba88cc7e0875cfc30371867d7b82f006770f (diff) | |
| parent | 20b60be518f05611fb11a98b57e73f6bb6c8b46e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/templates/qquickapplicationwindow.cpp
src/templates/qquickcontrol_p.h
src/templates/qquickpage.cpp
src/templates/qquickpopup.cpp
src/templates/qquickpopup_p_p.h
Change-Id: I265e0267afb22e3d3f80801191f1a810cd2be312
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/controls/gallery/gallery.qml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/controls/gallery/gallery.qml b/examples/controls/gallery/gallery.qml index 1e089230..fd019c65 100644 --- a/examples/controls/gallery/gallery.qml +++ b/examples/controls/gallery/gallery.qml @@ -176,7 +176,6 @@ ApplicationWindow { initialItem: Pane { id: pane - anchors.fill: parent Image { id: logo |