summaryrefslogtreecommitdiffstats
path: root/basicsuite/textinput/main.qml
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2016-12-08 09:42:42 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2016-12-09 14:40:26 +0200
commit9f09b4b3fea17e7ef3a4ce3701e70b480dbd4b0a (patch)
tree8cd75a6c1d40783db8198a105e95eee956a52602 /basicsuite/textinput/main.qml
parentb9585b440819e1444b20f30435f81c46801158c5 (diff)
parent21b73aea69a45e2f7bcbdf1b10e9908ae6bd9559 (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
* origin/5.7: Fixed demo .pro files: removed exclude.txt and wildcards used with content files Change-Id: Icb391cbcf1796879417e42ebf206d07bd03d2fae
Diffstat (limited to 'basicsuite/textinput/main.qml')
0 files changed, 0 insertions, 0 deletions