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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Change-Id: Ibbf9f16677a58bdcdd3ce63701ffa34db6f44916
This commit is contained in:
Eike Ziller
2020-05-11 11:36:22 +02:00
parent b9e79f7852 c370d345f1
commit 20ef5c6de3
270 changed files with 2794 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,10 +80,9 @@ static QHash<QString, QString> m_headerSourceMapping;
class CppToolsPluginPrivate
{
public:
CppToolsPluginPrivate()
{
m_codeModelSettings.fromSettings(ICore::settings());
}
CppToolsPluginPrivate() {}
void initialize() { m_codeModelSettings.fromSettings(ICore::settings()); }
~CppToolsPluginPrivate()
{
@@ -165,6 +164,7 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
Q_UNUSED(error)
d = new CppToolsPluginPrivate;
d->initialize();
JsExpander::registerGlobalObject<CppToolsJsExtension>("Cpp");
ExtensionSystem::PluginManager::addObject(&d->m_cppProjectUpdaterFactory);