From f167218d130f621921fbb7d5866395be09cacf31 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 12 Mar 2009 15:28:33 +0100
Subject: [PATCH] Initialize defines and includePaths

---
 src/plugins/genericprojectmanager/genericproject.cpp | 12 ++++++++----
 src/plugins/genericprojectmanager/genericproject.h   |  7 ++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 77b1e009687..23dc8e7d89e 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -404,8 +404,8 @@ void GenericProject::saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter
 
     Project::saveSettingsImpl(writer);
 
-    writer.saveValue("toolChain", _toolChainId);
-    writer.saveValue("includePaths", _includePaths);
+    writer.saveValue(QLatin1String("toolChain"), _toolChainId);
+    writer.saveValue(QLatin1String("includePaths"), _includePaths);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////
@@ -433,12 +433,16 @@ GenericBuildSettingsWidget::GenericBuildSettingsWidget(GenericProject *project)
 
     // include paths
     QListView *includePathsView = new QListView;
-    includePathsView->setModel(new ListModel(this));
+    _includePathsModel = new ListModel(this);
+    _includePathsModel->setStringList(_project->includePaths());
+    includePathsView->setModel(_includePathsModel);
     fl->addRow(tr("Include paths:"), includePathsView);
 
     // defines
     QListView *definesView = new QListView;
-    definesView->setModel(new ListModel(this));
+    _definesModel = new ListModel(this);
+    _definesModel->setStringList(_project->defines());
+    definesView->setModel(_definesModel);
     fl->addRow(tr("Defines:"), definesView);
 }
 
diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h
index 6d9e1e34822..9578be7bbe1 100644
--- a/src/plugins/genericprojectmanager/genericproject.h
+++ b/src/plugins/genericprojectmanager/genericproject.h
@@ -41,6 +41,10 @@
 #include <coreplugin/ifile.h>
 #include <utils/pathchooser.h>
 
+QT_BEGIN_NAMESPACE
+class QStringListModel;
+QT_END_NAMESPACE
+
 namespace GenericProjectManager {
 namespace Internal{
 
@@ -84,7 +88,6 @@ public:
     QStringList files() const;
     QStringList generated() const;
     QStringList defines() const;
-
     QString toolChainId() const;
 
 public Q_SLOTS:
@@ -158,6 +161,8 @@ private:
     GenericProject *_project;
     Core::Utils::PathChooser *_pathChooser;
     QString _buildConfiguration;
+    QStringListModel *_includePathsModel;
+    QStringListModel *_definesModel;
 };
 
 } // namespace Internal