diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:56:21 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-10 10:57:04 +0100 |
| commit | 8be6bac83ddf958e9658465630b86afcb0728800 (patch) | |
| tree | 6576e0ee428d7dfe0cd85222d56d939ef1047e63 /src/imports/platform/qquickplatformmenu.cpp | |
| parent | abc657ada6377d12e919113699da6e6960633516 (diff) | |
| parent | e91c9feab8a0cf4cff71cc68ab0f001b1531504f (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextfield.cpp
Change-Id: Ie80a2d3bcbb961a38e3dffa247547d3d860c231a
Diffstat (limited to 'src/imports/platform/qquickplatformmenu.cpp')
0 files changed, 0 insertions, 0 deletions