summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppmodelmanager.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2014-09-05 10:57:58 +0300
committerOrgad Shaneh <orgads@gmail.com>2014-09-19 11:38:58 +0200
commit9d3ed0285410aaa2e820d1d83507e6ef78806d49 (patch)
treeb5d6bdaa90cd939cff947f801033d15db0095706 /src/plugins/cpptools/cppmodelmanager.cpp
parentdd1bc1f607251bac271a6f8f493fb7b8cf8118d2 (diff)
downloadqt-creator-9d3ed0285410aaa2e820d1d83507e6ef78806d49.tar.gz
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 c023a1cac182b44baa8645e8955ef03ed0d31fd7) Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
-rw-r--r--src/plugins/cpptools/cppmodelmanager.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 7437f0eb9b..75f15ee6a7 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -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();