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

CppTools: Fix compilation with recent gcc 4.9.2

Browse Source 
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>
This commit is contained in:
Orgad Shaneh
2014-09-05 10:57:58 +03:00
committed by Erik Verbruggen
parent bf33b41da8
commit c023a1cac1
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -924,6 +924,24 @@ CppIndexingSupport *CppModelManager::indexingSupport()
return m_indexingSupporter ? m_indexingSupporter : m_internalIndexingSupport; 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) void CppModelManager::enableGarbageCollector(bool enable)
{ {
m_delayedGcTimer->stop(); m_delayedGcTimer->stop();

18
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -117,17 +117,9 @@ public:
virtual void setIndexingSupport(CppIndexingSupport *indexingSupport); virtual void setIndexingSupport(CppIndexingSupport *indexingSupport);
virtual CppIndexingSupport *indexingSupport(); virtual CppIndexingSupport *indexingSupport();
QStringList projectFiles() QStringList projectFiles();
{
ensureUpdated();
return m_projectFiles;
}
ProjectPart::HeaderPaths headerPaths() ProjectPart::HeaderPaths headerPaths();
{
ensureUpdated();
return m_headerPaths;
}
// Use this *only* for auto tests // Use this *only* for auto tests
void setHeaderPaths(const ProjectPart::HeaderPaths &headerPaths) void setHeaderPaths(const ProjectPart::HeaderPaths &headerPaths)
@@ -135,11 +127,7 @@ public:
m_headerPaths = headerPaths; m_headerPaths = headerPaths;
} }
QByteArray definedMacros() QByteArray definedMacros();
{
ensureUpdated();
return m_definedMacros;
}
void enableGarbageCollector(bool enable); void enableGarbageCollector(bool enable);