diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-12 11:48:59 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-10-12 11:48:59 +0200 |
commit | b311ed261a1176c52e68bf8b23bd4040ac12c7c0 (patch) | |
tree | 8ae99a01cb656d564ac288035516cf5101706a18 /tests/manual/manual.pro | |
parent | 50576aeb67e1470c9c5d2b52650bede1aa6b5697 (diff) | |
parent | 0007db13236fcee4ca90b885a67cc7de0f40836d (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
src/quicktemplates2/qquickbuttongroup.cpp
src/quicktemplates2/qquickoverlay.cpp
tests/auto/controls/data/tst_buttongroup.qml
Change-Id: Iae23aaf039c6095007966475294e93220dbead84
Diffstat (limited to 'tests/manual/manual.pro')
0 files changed, 0 insertions, 0 deletions