Commit f167218d authored by Roberto Raggi's avatar Roberto Raggi
Browse files

Initialize defines and includePaths

parent 4e6428bb
......@@ -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);
}
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment