Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (22 commits)
  Fix accessible menu not returning child name.
  Fix broken qglthreads autotest build on Solaris.
  Don't store the alignment attribute for spacers
  Update changelog for Qt-4.8.0: add QtWebKit notes
  Update changelog for Qt 4.8
  Fix broken Solaris build (getpwnam_r usage)
  Improve sbsv2 whatlog support.
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Modified SymSQL documentation in sql-driver.qdoc according review comments
  Added correct licence headers to symsql source files
  Documentation modifications for SymbianSQL added into sql-driver.qdoc
  Release Symbian SQL driver
  Fixed a typo found by static checker
  Added SQL driver plugin implementation for Symbian.
  Symbian: Fix qmdiarea autotest regressions
  Fix memory leaks in schema validation
  Symbian: Added copy-paste functionality to FEP input context
  symbian: Implement QNetworkConfiguration::purpose()
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)
  ...

1 files changed, 18 insertions, 2 deletions

diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
index 81f1a3b38e..665badb184 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -1452,6 +1452,8 @@ struct FormBuilderSaveLayoutEntry {
     explicit FormBuilderSaveLayoutEntry(QLayoutItem *li = 0) :
         item(li), row(-1), column(-1), rowSpan(0), columnSpan(0), alignment(0) {}
 
+    void setAlignment(Qt::Alignment al);
+
     QLayoutItem *item;
     int row;
     int column;
@@ -1460,6 +1462,20 @@ struct FormBuilderSaveLayoutEntry {
     Qt::Alignment alignment;
 };
 
+// filter out the case of "Spacer" and "QLayoutWidget" widgets
+void FormBuilderSaveLayoutEntry::setAlignment(Qt::Alignment al)
+{
+    if (!item->widget())
+        return;
+
+    const QString className = item->widget()->metaObject()->className();
+    if (className == QLatin1String("Spacer")
+            || className == QLatin1String("QLayoutWidget"))
+        return;
+
+    alignment = al;
+}
+
 // Create list from standard box layout
 static QList<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layout)
 {
@@ -1469,7 +1485,7 @@ static QList<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layout
         for (int idx = 0; idx < count; ++idx) {
             QLayoutItem *item = layout->itemAt(idx);
             FormBuilderSaveLayoutEntry entry(item);
-            entry.alignment = item->alignment();
+            entry.setAlignment(item->alignment());
             rc.append(entry);
         }
     }
@@ -1486,7 +1502,7 @@ static QList<FormBuilderSaveLayoutEntry> saveGridLayoutEntries(QGridLayout *grid
             QLayoutItem *item = gridLayout->itemAt(idx);
             FormBuilderSaveLayoutEntry entry(item);
             gridLayout->getItemPosition(idx, &entry.row, &entry.column, &entry.rowSpan,&entry.columnSpan);
-            entry.alignment = item->alignment();
+            entry.setAlignment(item->alignment());
             rc.append(entry);
         }
     }