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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/plugins/coreplugin/find/findtoolbar.h

Change-Id: I7db695a28473d1b16c46b1e39a4d6fce537c13a1
This commit is contained in:
Eike Ziller
2016-03-16 15:28:47 +01:00
parent bcf7a11c24 6cecb7e4db
commit f1e14468c6
112 changed files with 1472 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/plugins/cpptools/CppTools.mimetypes.xml Normal file
View File

@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
<mime-type type="text/x-csrc">
<comment>C source code</comment>
<sub-class-of type="text/plain"/>
<alias type="text/x-c"/>
<glob pattern="*.c" case-sensitive="true" weight="70"/>
</mime-type>
<mime-type type="text/vnd.nvidia.cuda.csrc">
<sub-class-of type="text/x-csrc"/>
<comment>NVIDIA CUDA C source code</comment>
<glob pattern="*.cu"/>
</mime-type>
<mime-type type="text/x-chdr">
<comment>C header</comment>
<sub-class-of type="text/x-csrc"/>
<!-- reduce weight from freedesktop to avoid conflict with text/x-c++hdr -->
<glob pattern="*.h" weight="30"/>
</mime-type>
<!-- Those are used to find matching headers by the CppTools plugin,
so, they should match -->
<mime-type type="text/x-c++hdr">
<sub-class-of type="text/x-chdr"/>
<comment>C++ header</comment>
<glob pattern="*.hh" weight="70"/>
<glob pattern="*.hxx" weight="70"/>
<glob pattern="*.h++" weight="70"/>
<glob pattern="*.hpp" weight="70"/>
<glob pattern="*.hp" weight="70"/>
<!-- Additions to freedesktop: -->
<glob pattern="*.h" weight="70"/>
<glob pattern="*.H" 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. -->
<magic priority="50">
<match value="#ifndef " type="string" offset="0:2000"/>
<match value="#if " type="string" offset="0:2000"/>
<match value="#include " type="string" offset="0:2000"/>
</magic>
</mime-type>
<mime-type type="text/x-c++src">
<comment>C++ source code</comment>
<sub-class-of type="text/x-csrc"/>
<glob pattern="*.cpp" weight="70"/>
<glob pattern="*.cxx" weight="70"/>
<glob pattern="*.cc" weight="70"/>
<glob pattern="*.C" case-sensitive="true" weight="70"/>
<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>
</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">
<comment>Qt MOC file</comment>
<!-- Fix to freedesktop: moc is C++ source -->
<sub-class-of type="text/x-c++src"/>
<glob pattern="*.moc" weight="70"/>
</mime-type>
<mime-type type="text/x-objc++src">
<comment>Objective-C++ source code</comment>
<sub-class-of type="text/x-c++src"/>
<sub-class-of type="text/x-objcsrc"/>
<glob pattern="*.mm" weight="70"/>
</mime-type>
</mime-info>

1
src/plugins/cpptools/cpptools.qrc
View File

@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/cpptools">
<file>images/category_cpp.png</file>
<file>CppTools.mimetypes.xml</file>
</qresource>
</RCC>

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_CPP_SOURCE_MIMETYPE[] = "text/x-objc++src";
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.
const char CPPTOOLS_SETTINGSGROUP[] = "CppTools";

2
src/plugins/cpptools/cpptoolsplugin.cpp
View File

@@ -140,6 +140,8 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
Q_UNUSED(arguments)
Q_UNUSED(error)
Utils::MimeDatabase::addMimeTypes(QLatin1String(":/cpptools/CppTools.mimetypes.xml"));
CppModelManager::instance()->setParent(this);
m_settings = new CppToolsSettings(this); // force registration of cpp tools settings

3
src/plugins/cpptools/generatedcodemodelsupport.cpp
View File

@@ -122,8 +122,9 @@ void GeneratedCodeModelSupport::update(const QList<ProjectExplorer::ExtraCompile
continue;
extraCompilerCache.insert(generator);
foreach (const Utils::FileName &generatedFile, generator->targets())
generator->forEachTarget([mm, generator](const Utils::FileName &generatedFile) {
new GeneratedCodeModelSupport(mm, generator, generatedFile);
});
}
}