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

CppEditor: Register qdoc as a separate mimetype from c++ sources

Browse Source 
Add a new constant for qdoc mimetype to cpptoolsconstants.
Make the CppEditor handle qdoc mimetype.

This change has one user user visible effect:
Adding qdoc files to a qmake project will no longer put those files
into SOURCES where qmake will then try to compile them. They will show
up in "Other Files" instead.

Task-number: QTCREATORBUG-15872
Change-Id: Ibbf9af0a84fab59138f6b9ab41f1bba737b455c2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-03-15 13:36:50 +01:00
parent 1287b72728
commit 09cdd1c4a5
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cppeditor/CppEditor.mimetypes.xml
View File

@@ -54,7 +54,6 @@
<!-- Additions to freedesktop: --> <!-- Additions to freedesktop: -->
<glob pattern="*.cp" weight="70"/> <glob pattern="*.cp" weight="70"/>
<glob pattern="*.inl" weight="70"/> <glob pattern="*.inl" weight="70"/>
<glob pattern="*.qdoc" weight="70"/>
<glob pattern="*.tcc" weight="70"/> <glob pattern="*.tcc" weight="70"/>
<glob pattern="*.tpp" weight="70"/> <glob pattern="*.tpp" weight="70"/>
<glob pattern="*.t++" weight="70"/> <glob pattern="*.t++" weight="70"/>
@@ -64,6 +63,12 @@
</magic> </magic>
</mime-type> </mime-type>
<mime-type type="text/x-qdoc">
<comment>Qt documentation file</comment>
<sub-class-of type="text/plain"/>
<glob pattern="*.qdoc" weight="70"/>
</mime-type>
<mime-type type="text/x-moc"> <mime-type type="text/x-moc">
<comment>Qt MOC file</comment> <comment>Qt MOC file</comment>
<acronym>Qt MOC</acronym> <acronym>Qt MOC</acronym>

1
src/plugins/cppeditor/cppeditorplugin.cpp
View File

@@ -87,6 +87,7 @@ public:
addMimeType(CppTools::Constants::C_HEADER_MIMETYPE); addMimeType(CppTools::Constants::C_HEADER_MIMETYPE);
addMimeType(CppTools::Constants::CPP_SOURCE_MIMETYPE); addMimeType(CppTools::Constants::CPP_SOURCE_MIMETYPE);
addMimeType(CppTools::Constants::CPP_HEADER_MIMETYPE); addMimeType(CppTools::Constants::CPP_HEADER_MIMETYPE);
addMimeType(CppTools::Constants::QDOC_MIMETYPE);
setDocumentCreator([]() { return new CppEditorDocument; }); setDocumentCreator([]() { return new CppEditorDocument; });
setEditorWidgetCreator([]() { return new CppEditorWidget; }); setEditorWidgetCreator([]() { return new CppEditorWidget; });

1
src/plugins/cpptools/cpptoolsconstants.h
View File

@@ -42,6 +42,7 @@ const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src";
const char OBJECTIVE_C_SOURCE_MIMETYPE[] = "text/x-objcsrc"; const char OBJECTIVE_C_SOURCE_MIMETYPE[] = "text/x-objcsrc";
const char OBJECTIVE_CPP_SOURCE_MIMETYPE[] = "text/x-objc++src"; const char OBJECTIVE_CPP_SOURCE_MIMETYPE[] = "text/x-objc++src";
const char CPP_HEADER_MIMETYPE[] = "text/x-c++hdr"; const char CPP_HEADER_MIMETYPE[] = "text/x-c++hdr";
const char QDOC_MIMETYPE[] = "text/x-qdoc";
// QSettings keys for use by the "New Class" wizards. // QSettings keys for use by the "New Class" wizards.
const char CPPTOOLS_SETTINGSGROUP[] = "CppTools"; const char CPPTOOLS_SETTINGSGROUP[] = "CppTools";