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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Change-Id: I259a402bc896fc2e359cc96b7510453ac9a9a552
This commit is contained in:
Orgad Shaneh
2016-11-28 15:27:51 +02:00
parent f69a466534 96256d1ecc
commit 7b3642cce4
128 changed files with 3030 additions and 1713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,10 @@ GeneratedCodeModelSupport::GeneratedCodeModelSupport(CppModelManager *modelmanag
QLoggingCategory log("qtc.cpptools.generatedcodemodelsupport");
qCDebug(log) << "ctor GeneratedCodeModelSupport for" << m_generator->source()
<< generatedFile;
init();
connect(m_generator, &ProjectExplorer::ExtraCompiler::contentsChanged,
this, &GeneratedCodeModelSupport::onContentsChanged, Qt::QueuedConnection);
onContentsChanged(generatedFile);
}
GeneratedCodeModelSupport::~GeneratedCodeModelSupport()
@@ -95,12 +98,6 @@ void GeneratedCodeModelSupport::onContentsChanged(const Utils::FileName &file)
}
}
void GeneratedCodeModelSupport::init() const
{
connect(m_generator, &ProjectExplorer::ExtraCompiler::contentsChanged,
this, &GeneratedCodeModelSupport::onContentsChanged, Qt::QueuedConnection);
}
QByteArray GeneratedCodeModelSupport::contents() const
{
return m_generator->content(m_generatedFileName);

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

@@ -59,7 +59,6 @@ public:
private:
void onContentsChanged(const Utils::FileName &file);
void init() const;
Utils::FileName m_generatedFileName;
ProjectExplorer::ExtraCompiler *m_generator;
};