From c2e35cd3ec62f1be9234acdbb43ea21da75eada6 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 19 Jun 2012 12:07:21 +0200
Subject: [PATCH] Explicitly set QFormLayout::ExpandingFieldsGrow.

Mac has a different default value, causing the fields to have
a static size.

Task-number: QTBUG-26222
Change-Id: Ib983162dbfd61d083c842f87eac1570ae7dc3a7a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
 src/designer/src/components/propertyeditor/newdynamicpropertydialog.ui | 3 +++
 src/designer/src/lib/shared/newactiondialog.ui                         | 3 +++
 src/designer/src/lib/shared/qdesigner_promotiondialog.cpp              | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.ui b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.ui
index 2aa91f3..dec3bb3 100644
--- a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.ui
+++ b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.ui
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" name="verticalLayout" >
    <item>
     <layout class="QFormLayout" name="formLayout" >
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::ExpandingFieldsGrow</enum>
+     </property>
      <item row="0" column="1" >
       <widget class="QLineEdit" name="m_lineEdit" >
        <property name="minimumSize" >
diff --git a/src/designer/src/lib/shared/newactiondialog.ui b/src/designer/src/lib/shared/newactiondialog.ui
index 4e0e2b5..0fa8338 100644
--- a/src/designer/src/lib/shared/newactiondialog.ui
+++ b/src/designer/src/lib/shared/newactiondialog.ui
@@ -56,6 +56,9 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QFormLayout" name="formLayout">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::ExpandingFieldsGrow</enum>
+     </property>
      <item row="0" column="0">
       <widget class="QLabel" name="textLabel">
        <property name="text">
diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
index 61ed983..e2817f9 100644
--- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
+++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
@@ -107,6 +107,7 @@ namespace qdesigner_internal {
 
         // Grid
         QFormLayout *formLayout = new QFormLayout();
+        formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); // Mac
         formLayout->addRow(tr("Base class name:"),     m_baseClassCombo);
         formLayout->addRow(tr("Promoted class name:"), m_classNameEdit);
         formLayout->addRow(tr("Header file:"),         m_includeFileEdit);
-- 
2.7.4