summaryrefslogtreecommitdiff
path: root/src/dialogs/qquickdialog.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-19 14:31:56 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-19 14:31:56 +0200
commit3b093789b07c670e29d3275e26c4e7122db042ae (patch)
tree46d11026341721183560a4168550987b7633f40b /src/dialogs/qquickdialog.cpp
parent94c511b63af10a5507936ab7fbdd517144cde872 (diff)
parentd9aae9ff99d20b58487b0a48801864d13115363b (diff)
downloadqtquickcontrols-3b093789b07c670e29d3275e26c4e7122db042ae.tar.gz
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts: src/controls/controls.pro Change-Id: I0150ca08d83f292a5c8587ec886e206124757df4
Diffstat (limited to 'src/dialogs/qquickdialog.cpp')
0 files changed, 0 insertions, 0 deletions