From 579fe76f66e797e78d907282c8d2b95c9be58fb7 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Thu, 23 Jul 2009 16:40:15 +0200
Subject: [PATCH] Fix layout of generic projects' build settings.

---
 .../genericprojectmanager/genericmakestep.ui  | 37 ++++++++-----------
 .../genericprojectmanager/genericproject.cpp  |  3 ++
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/plugins/genericprojectmanager/genericmakestep.ui b/src/plugins/genericprojectmanager/genericmakestep.ui
index cf7420d03cf..619584891a3 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.ui
+++ b/src/plugins/genericprojectmanager/genericmakestep.ui
@@ -6,12 +6,18 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>274</width>
-    <height>392</height>
+    <width>399</width>
+    <height>279</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QFormLayout" name="formLayout">
+   <property name="fieldGrowthPolicy">
+    <enum>QFormLayout::ExpandingFieldsGrow</enum>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QLabel" name="makeLabel">
      <property name="text">
       <string>Override %1:</string>
@@ -21,10 +27,10 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item row="0" column="1">
     <widget class="QLineEdit" name="makeLineEdit"/>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QLabel" name="makeArgumentsLabel">
      <property name="text">
       <string>Make arguments:</string>
@@ -34,10 +40,10 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item row="1" column="1">
     <widget class="QLineEdit" name="makeArgumentsLineEdit"/>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QLabel" name="targetsLabel">
      <property name="text">
       <string>Targets:</string>
@@ -47,22 +53,9 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item row="2" column="1">
     <widget class="QListWidget" name="targetsList"/>
    </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 46e8fb7d7ff..7f3ead47382 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -519,6 +519,8 @@ GenericBuildSettingsWidget::GenericBuildSettingsWidget(GenericProject *project)
     : m_project(project)
 {
     QFormLayout *fl = new QFormLayout(this);
+    fl->setContentsMargins(0, -1, 0, -1);
+    fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
 
     // build directory
     m_pathChooser = new Core::Utils::PathChooser(this);
@@ -528,6 +530,7 @@ GenericBuildSettingsWidget::GenericBuildSettingsWidget(GenericProject *project)
 
     // tool chain
     QComboBox *toolChainChooser = new QComboBox;
+    toolChainChooser->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     toolChainChooser->addItems(ProjectExplorer::ToolChain::supportedToolChains());
     toolChainChooser->setCurrentIndex(toolChainChooser->findText(m_project->toolChainId()));
     fl->addRow(tr("Toolchain:"), toolChainChooser);