forked from qt-creator/qt-creator
CppTools: Fix compilation with recent gcc 4.9.2
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62224
.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppEditor::Internal::CppCodeModelInspectorDialog::refresh()':
cppcodemodelinspectordialog.cpp:(.text+0x79fc): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'
.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::definedMacros()':
cppcodemodelinspectordialog.cpp:+0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'
.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::headerPaths()':
cppcodemodelinspectordialog.cpp: +0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'
Change-Id: Ie0e01f7628668cbbe11b701a93caef98bb8e335f
Reviewed-by: Adam Majer <adamm@zombino.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
(cherry picked from commit c023a1cac1
)
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
dd1bc1f607
commit
9d3ed02854
@@ -920,6 +920,24 @@ CppIndexingSupport *CppModelManager::indexingSupport()
|
||||
return m_indexingSupporter ? m_indexingSupporter : m_internalIndexingSupport;
|
||||
}
|
||||
|
||||
QStringList CppModelManager::projectFiles()
|
||||
{
|
||||
ensureUpdated();
|
||||
return m_projectFiles;
|
||||
}
|
||||
|
||||
ProjectPart::HeaderPaths CppModelManager::headerPaths()
|
||||
{
|
||||
ensureUpdated();
|
||||
return m_headerPaths;
|
||||
}
|
||||
|
||||
QByteArray CppModelManager::definedMacros()
|
||||
{
|
||||
ensureUpdated();
|
||||
return m_definedMacros;
|
||||
}
|
||||
|
||||
void CppModelManager::enableGarbageCollector(bool enable)
|
||||
{
|
||||
m_delayedGcTimer->stop();
|
||||
|
@@ -122,17 +122,9 @@ public:
|
||||
virtual void setIndexingSupport(CppIndexingSupport *indexingSupport);
|
||||
virtual CppIndexingSupport *indexingSupport();
|
||||
|
||||
QStringList projectFiles()
|
||||
{
|
||||
ensureUpdated();
|
||||
return m_projectFiles;
|
||||
}
|
||||
QStringList projectFiles();
|
||||
|
||||
ProjectPart::HeaderPaths headerPaths()
|
||||
{
|
||||
ensureUpdated();
|
||||
return m_headerPaths;
|
||||
}
|
||||
ProjectPart::HeaderPaths headerPaths();
|
||||
|
||||
// Use this *only* for auto tests
|
||||
void setHeaderPaths(const ProjectPart::HeaderPaths &headerPaths)
|
||||
@@ -140,11 +132,7 @@ public:
|
||||
m_headerPaths = headerPaths;
|
||||
}
|
||||
|
||||
QByteArray definedMacros()
|
||||
{
|
||||
ensureUpdated();
|
||||
return m_definedMacros;
|
||||
}
|
||||
QByteArray definedMacros();
|
||||
|
||||
void enableGarbageCollector(bool enable);
|
||||
|
||||
|
Reference in New Issue
Block a user