summaryrefslogtreecommitdiff
path: root/src/dialogs/qquickfontdialog.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-01 10:45:47 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-01 10:45:52 +0200
commit22fab1502f562bccb3c16dde0288aa867e3b094a (patch)
tree06f2c6ebbf9c3866084a26372cd32d378e21b501 /src/dialogs/qquickfontdialog.cpp
parent89f19ed0c65efa4df1fae6dbaac4486d3ef49f3a (diff)
parent84a26f223b220a444dec2b43fffc71dab7e00d1d (diff)
downloadqtquickcontrols-22fab1502f562bccb3c16dde0288aa867e3b094a.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I316bcbbc5308fda27728df15db1e780aa073da2a
Diffstat (limited to 'src/dialogs/qquickfontdialog.cpp')
0 files changed, 0 insertions, 0 deletions