summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetextedit.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-04-05 12:27:41 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-04-05 12:27:41 +0000
commite6e42c42d374c7a18a3affae822462931eaa0a71 (patch)
treeab8ff395910333edff3c80df993354f25e675696 /src/declarative/graphicsitems/qdeclarativetextedit.cpp
parent695460401d9a89d2f156016d51601b2e59b64105 (diff)
parent2ce3ad556d3e0d0af585fc3e6c62e1802c26a3b8 (diff)
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit.cpp')
0 files changed, 0 insertions, 0 deletions