diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-07-25 11:54:44 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-25 11:54:44 +0200 |
commit | efa5a7b6d76c85423e45b85e3db97186dc2d1923 (patch) | |
tree | 096f1a42d2b5943c742e1302489d548edfb026a4 /src/plugins/perforce | |
parent | c8962c34baae380f7db9840da419998007411226 (diff) | |
parent | 41127e0f4769bd32f3f5d88c2064ba61f222e195 (diff) | |
download | qt-creator-efa5a7b6d76c85423e45b85e3db97186dc2d1923.tar.gz |
Merge remote-tracking branch 'origin/4.4'
Conflicts:
qtcreator.pri
Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
Diffstat (limited to 'src/plugins/perforce')
-rw-r--r-- | src/plugins/perforce/Perforce.json.in | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/perforce/Perforce.json.in b/src/plugins/perforce/Perforce.json.in index 7d408c00e4..cb92d2542d 100644 --- a/src/plugins/perforce/Perforce.json.in +++ b/src/plugins/perforce/Perforce.json.in @@ -17,16 +17,16 @@ \"Url\" : \"http://www.qt.io\", $$dependencyList, - \"Mimetypes\" : \" - <?xml version=\'1.0\'?> - <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'> - <mime-type type=\'text/vnd.qtcreator.p4.submit\'> - <comment>Perforce submit template</comment> - <sub-class-of type=\'text/plain\'/> - <magic priority=\'50\'> - <match value=\'# A Perforce Change Specification.\' type=\'string\' offset=\'0\'/> - </magic> - </mime-type> - </mime-info> - \" + \"Mimetypes\" : [ + \"<?xml version=\'1.0\'?>\", + \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\", + \" <mime-type type=\'text/vnd.qtcreator.p4.submit\'>\", + \" <comment>Perforce submit template</comment>\", + \" <sub-class-of type=\'text/plain\'/>\", + \" <magic priority=\'50\'>\", + \" <match value=\'# A Perforce Change Specification.\' type=\'string\' offset=\'0\'/>\", + \" </magic>\", + \" </mime-type>\", + \"</mime-info>\" + ] } |