diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-20 21:32:04 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-20 21:32:29 +0200 |
| commit | f5bee820aec44b22843299c25c5bd03e090c60bb (patch) | |
| tree | 3c486bcc3f5031565ebae626bbec613625f29bd6 /examples | |
| parent | a2ab56bc3d778c7a5e30f58d0d29116ec6da793a (diff) | |
| parent | c75ca309916ae1fec31ab37f25a7ddf9ea3c150a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/quicktemplates2/qquickcontainer.cpp
Change-Id: I7c41619a81b4fdd0d8ccaa4f0bb489a9b84e3865
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quickcontrols2/gallery/gallery.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml index 38e60632..04836da5 100644 --- a/examples/quickcontrols2/gallery/gallery.qml +++ b/examples/quickcontrols2/gallery/gallery.qml @@ -54,7 +54,7 @@ ApplicationWindow { Settings { id: settings - property string style: "Universal" + property string style: "Default" } header: ToolBar { |