summaryrefslogtreecommitdiff
path: root/src/dialogs/qquickfontdialog.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-23 03:02:22 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-23 03:02:22 +0200
commitbfb7d1a9b026d3735930b31d79d936d5a3d4c79d (patch)
treed70fdb16dcb9525c28e0e2c5927c5372b2cc64b3 /src/dialogs/qquickfontdialog.cpp
parentf2c24adbb3e9561bb2f49f9dfa4daf5d5f315f6a (diff)
parent3b71eea2e6e712103452c98756cd6ce53aa4ebca (diff)
downloadqtquickcontrols-bfb7d1a9b026d3735930b31d79d936d5a3d4c79d.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia4e23f05ee0dc32d13ad809f4021cd5f0cdff701
Diffstat (limited to 'src/dialogs/qquickfontdialog.cpp')
0 files changed, 0 insertions, 0 deletions