feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Conflicts:
	qtcreator.pri

Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
This commit is contained in:
Eike Ziller
2017-07-25 11:54:44 +02:00
parent c8962c34ba 41127e0f47
commit efa5a7b6d7
139 changed files with 2523 additions and 1053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/perforce/Perforce.json.in
View File

@@ -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>\"
]
}