From 3378b18f6fef29e6293985bd58629518007b0ada Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 22 Jul 2009 17:02:12 +0200
Subject: [PATCH] Corrected field growth policies.

---
 .../customexecutablerunconfiguration.cpp             |  1 +
 src/plugins/projectexplorer/processstep.ui           |  9 ++++++++-
 src/plugins/qt4projectmanager/makestep.ui            |  8 +++++++-
 src/plugins/qt4projectmanager/qmakestep.ui           | 12 ++++++++++++
 .../qt4projectmanager/qt4runconfiguration.cpp        |  1 +
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index 8b182e21671..5ff7d25e45a 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -68,6 +68,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
     : m_ignoreChange(false), m_runConfiguration(rc)
 {
     QFormLayout *layout = new QFormLayout;
+    layout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
     layout->setMargin(0);
 
     m_userName = new QLineEdit(this);
diff --git a/src/plugins/projectexplorer/processstep.ui b/src/plugins/projectexplorer/processstep.ui
index 6e52c4c8893..26fb34a3595 100644
--- a/src/plugins/projectexplorer/processstep.ui
+++ b/src/plugins/projectexplorer/processstep.ui
@@ -6,11 +6,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>505</width>
+    <width>509</width>
     <height>271</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QGroupBox" name="enabledGroupBox">
      <property name="title">
@@ -86,6 +92,7 @@
    <class>Core::Utils::PathChooser</class>
    <extends>QWidget</extends>
    <header location="global">utils/pathchooser.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/plugins/qt4projectmanager/makestep.ui b/src/plugins/qt4projectmanager/makestep.ui
index f2007e7e398..558fbeb6aad 100644
--- a/src/plugins/qt4projectmanager/makestep.ui
+++ b/src/plugins/qt4projectmanager/makestep.ui
@@ -7,10 +7,16 @@
     <x>0</x>
     <y>0</y>
     <width>235</width>
-    <height>64</height>
+    <height>78</height>
    </rect>
   </property>
   <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">
diff --git a/src/plugins/qt4projectmanager/qmakestep.ui b/src/plugins/qt4projectmanager/qmakestep.ui
index abb882d7164..5d843c4fd0d 100644
--- a/src/plugins/qt4projectmanager/qmakestep.ui
+++ b/src/plugins/qt4projectmanager/qmakestep.ui
@@ -11,6 +11,12 @@
    </rect>
   </property>
   <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="label_2">
      <property name="text">
@@ -20,6 +26,12 @@
    </item>
    <item row="0" column="1">
     <widget class="QComboBox" name="buildConfigurationComboBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <item>
       <property name="text">
        <string>debug</string>
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 10201498fb5..e7e5f3cf6ac 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -118,6 +118,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
     m_isShown(false)
 {
     QFormLayout *toplayout = new QFormLayout();
+    toplayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
     toplayout->setMargin(0);
 
     QLabel *nameLabel = new QLabel(tr("Name:"));