diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-20 11:11:42 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-20 11:11:42 +0200 |
commit | eb70f8179628fe1298ff8fa0032589513e28e303 (patch) | |
tree | 690140ebca31c20480c358317fd41541ef26d07b /LICENSE.FDL | |
parent | ea043d5d838f638e4bc5461aa23fb69a1a9e1eb6 (diff) | |
parent | edded3b5179de4e387f8bb173311bf39df9c43d7 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/ApplicationWindow.qml
src/imports/controls/material/ApplicationWindow.qml
src/imports/controls/universal/ApplicationWindow.qml
src/imports/templates/qtquicktemplates2plugin.cpp
Change-Id: I9041c69f4ce5dab1d1b994d2318feddb696e56bf
Diffstat (limited to 'LICENSE.FDL')
0 files changed, 0 insertions, 0 deletions