C++: introduce a project config file field in the projectPart.

This field is used by the generic project manager which passes the
".config" file in it. The advantage is that both the SnapshotUpdater and
the clang code model do not need to do anything smart, but can pass it
directly to the preprocessor.

Task-number: QTCREATORBUG-11390
Change-Id: I44fc7b20afd28fb59608412f2cce86af6f7e7d6b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

1 files changed, 12 insertions, 7 deletions

diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
index 461ce25a8e..c602bd25d0 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
+++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
@@ -560,14 +560,16 @@ void CppCodeModelInspectorDumper::dumpProjectInfos(
                 projectName = project->displayName();
                 projectFilePath = project->projectFilePath();
             }
+            if (!part->projectConfigFile.isEmpty())
+                m_out << i3 << "Project Config File: " << part->projectConfigFile << "\n";
             m_out << i2 << "Project Part \"" << part->projectFile << "\"{{{3\n";
-            m_out << i3 << "Project Part Name: " << part->displayName << "\n";
-            m_out << i3 << "Project Name     : " << projectName << "\n";
-            m_out << i3 << "Project File     : " << projectFilePath << "\n";
-            m_out << i3 << "C Version        : " << toString(part->cVersion) << "\n";
-            m_out << i3 << "CXX Version      : " << toString(part->cxxVersion) << "\n";
-            m_out << i3 << "CXX Extensions   : " << toString(part->cxxExtensions) << "\n";
-            m_out << i3 << "Qt Version       : " << toString(part->qtVersion) << "\n";
+            m_out << i3 << "Project Part Name  : " << part->displayName << "\n";
+            m_out << i3 << "Project Name       : " << projectName << "\n";
+            m_out << i3 << "Project File       : " << projectFilePath << "\n";
+            m_out << i3 << "C Version          : " << toString(part->cVersion) << "\n";
+            m_out << i3 << "CXX Version        : " << toString(part->cxxVersion) << "\n";
+            m_out << i3 << "CXX Extensions     : " << toString(part->cxxExtensions) << "\n";
+            m_out << i3 << "Qt Version         : " << toString(part->qtVersion) << "\n";
 
             if (!part->files.isEmpty()) {
                 m_out << i3 << "Files:{{{4\n";
@@ -2246,6 +2248,9 @@ void CppCodeModelInspectorDialog::updateProjectPartData(const ProjectPart::Ptr &
         << qMakePair(QString::fromLatin1("CXX Extensions"), toString(part->cxxExtensions))
         << qMakePair(QString::fromLatin1("Qt Version"), toString(part->qtVersion))
         ;
+    if (!part->projectConfigFile.isEmpty())
+        table.prepend(qMakePair(QString::fromLatin1("Project Config File"),
+                                part->projectConfigFile));
     m_partGenericInfoModel->configure(table);
     resizeColumns<KeyValueModel>(m_ui->partGeneralView);