diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-01-07 13:24:12 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-01-07 13:24:12 +0100 |
| commit | 04a4bacbf91974874b7743d82956842bc4b7cbcd (patch) | |
| tree | 091e27ce8fb601b36b6b82837f281ac70439ca55 /src/plugins/cpptools | |
| parent | 9ee785a4efc0ddbf1edf705de690955a97e0a34b (diff) | |
| parent | bcafe202c9f8a7c4bad4cf60095138b1d6cbf2ac (diff) | |
| download | qt-creator-04a4bacbf91974874b7743d82956842bc4b7cbcd.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/coreplugin/dialogs/externaltoolconfig.ui
Change-Id: Ie38e9028cee599578c59b22325d85c097335243e
Diffstat (limited to 'src/plugins/cpptools')
| -rw-r--r-- | src/plugins/cpptools/CppTools.json.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/cpptools/CppTools.json.in b/src/plugins/cpptools/CppTools.json.in index 22fb394e41..3b7680337d 100644 --- a/src/plugins/cpptools/CppTools.json.in +++ b/src/plugins/cpptools/CppTools.json.in @@ -54,6 +54,11 @@ \" <!-- Additions to freedesktop: -->\", \" <glob pattern=\'*.h\' weight=\'70\'/>\", \" <glob pattern=\'*.H\' weight=\'70\'/>\", + \" <glob pattern=\'*.inl\' weight=\'70\'/>\", + \" <glob pattern=\'*.tcc\' weight=\'70\'/>\", + \" <glob pattern=\'*.tpp\' weight=\'70\'/>\", + \" <glob pattern=\'*.t++\' weight=\'70\'/>\", + \" <glob pattern=\'*.txx\' weight=\'70\'/>\", \" <!-- Find include guards of header files without extension, for\", \" example, STL ones like <string>. Those can have a big initial\", \" comment exceeding 1000 chars, though. -->\", @@ -74,11 +79,6 @@ \" <glob pattern=\'*.c++\' weight=\'70\'/>\", \" <!-- Additions to freedesktop: -->\", \" <glob pattern=\'*.cp\' weight=\'70\'/>\", - \" <glob pattern=\'*.inl\' weight=\'70\'/>\", - \" <glob pattern=\'*.tcc\' weight=\'70\'/>\", - \" <glob pattern=\'*.tpp\' weight=\'70\'/>\", - \" <glob pattern=\'*.t++\' weight=\'70\'/>\", - \" <glob pattern=\'*.txx\' weight=\'70\'/>\", \" <magic priority=\'30\'>\", \" <match value=\'-*- C++ -*-\' type=\'string\' offset=\'0:30\'/>\", \" </magic>\", |