Merge remote branch 'qt/master' into file-engine-refactor

Conflicts:
	demos/declarative/minehunt/minehunt.pro
	src/corelib/io/io.pri
	src/corelib/io/qfsfileengine.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/io/qfsfileengine_win.cpp
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtDeclarativeu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtDeclarativeu.def
	src/s60installs/eabi/QtGuiu.def
	tests/auto/qapplication/test/test.pro
	tests/auto/qaudioinput/qaudioinput.pro
	tests/auto/qaudiooutput/qaudiooutput.pro
	tests/auto/qchar/qchar.pro
	tests/auto/qdiriterator/qdiriterator.pro
	tests/auto/qsound/qsound.pro

3 files changed, 23 insertions, 0 deletions

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index a2bc89d..e6fcd46 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -1096,6 +1096,8 @@ void WriteInitialization::acceptLayoutItem(DomLayoutItem *node)
         const int colSpan = node->hasAttributeColSpan() ? node->attributeColSpan() : 1;
 
         addArgs = QString::fromLatin1("%1, %2, %3, %4, %5").arg(itemName).arg(row).arg(col).arg(rowSpan).arg(colSpan);
+        if (!node->attributeAlignment().isEmpty())
+            addArgs += QLatin1String(", ") + node->attributeAlignment();
     } else {
         if (layout->attributeClass() == QLatin1String("QFormLayout")) {
             methodPrefix = QLatin1String("set");
@@ -1105,6 +1107,8 @@ void WriteInitialization::acceptLayoutItem(DomLayoutItem *node)
             addArgs = QString::fromLatin1("%1, %2, %3").arg(row).arg(role).arg(itemName);
         } else {
             addArgs = itemName;
+            if (layout->attributeClass().contains(QLatin1String("Box")) && !node->attributeAlignment().isEmpty())
+                addArgs += QLatin1String(", 0, ") + node->attributeAlignment();
         }
     }
 
diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp
index 1988696..e094eaf 100644
--- a/src/tools/uic/ui4.cpp
+++ b/src/tools/uic/ui4.cpp
@@ -3673,6 +3673,7 @@ void DomLayoutItem::clear(bool clear_all)
     m_attr_rowSpan = 0;
     m_has_attr_colSpan = false;
     m_attr_colSpan = 0;
+    m_has_attr_alignment = false;
     }
 
     m_kind = Unknown;
@@ -3694,6 +3695,7 @@ DomLayoutItem::DomLayoutItem()
     m_attr_rowSpan = 0;
     m_has_attr_colSpan = false;
     m_attr_colSpan = 0;
+    m_has_attr_alignment = false;
     m_widget = 0;
     m_layout = 0;
     m_spacer = 0;
@@ -3727,6 +3729,10 @@ void DomLayoutItem::read(QXmlStreamReader &reader)
             setAttributeColSpan(attribute.value().toString().toInt());
             continue;
         }
+        if (name == QLatin1String("alignment")) {
+            setAttributeAlignment(attribute.value().toString());
+            continue;
+        }
         reader.raiseError(QLatin1String("Unexpected attribute ") + name.toString());
     }
 
@@ -3779,6 +3785,8 @@ void DomLayoutItem::read(const QDomElement &node)
         setAttributeRowSpan(node.attribute(QLatin1String("rowspan")).toInt());
     if (node.hasAttribute(QLatin1String("colspan")))
         setAttributeColSpan(node.attribute(QLatin1String("colspan")).toInt());
+    if (node.hasAttribute(QLatin1String("alignment")))
+        setAttributeAlignment(node.attribute(QLatin1String("alignment")));
 
     for (QDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
         if (!n.isElement())
@@ -3828,6 +3836,9 @@ void DomLayoutItem::write(QXmlStreamWriter &writer, const QString &tagName) cons
     if (hasAttributeColSpan())
         writer.writeAttribute(QLatin1String("colspan"), QString::number(attributeColSpan()));
 
+    if (hasAttributeAlignment())
+        writer.writeAttribute(QLatin1String("alignment"), attributeAlignment());
+
     switch (kind()) {
         case Widget: {
             DomWidget* v = elementWidget();
diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h
index a464a89..836175e 100644
--- a/src/tools/uic/ui4.h
+++ b/src/tools/uic/ui4.h
@@ -1427,6 +1427,11 @@ public:
     inline void setAttributeColSpan(int a) { m_attr_colSpan = a; m_has_attr_colSpan = true; }
     inline void clearAttributeColSpan() { m_has_attr_colSpan = false; }
 
+    inline bool hasAttributeAlignment() const { return m_has_attr_alignment; }
+    inline QString attributeAlignment() const { return m_attr_alignment; }
+    inline void setAttributeAlignment(const QString& a) { m_attr_alignment = a; m_has_attr_alignment = true; }
+    inline void clearAttributeAlignment() { m_has_attr_alignment = false; }
+
     // child element accessors
     enum Kind { Unknown = 0, Widget, Layout, Spacer };
     inline Kind kind() const { return m_kind; }
@@ -1460,6 +1465,9 @@ private:
     int m_attr_colSpan;
     bool m_has_attr_colSpan;
 
+    QString m_attr_alignment;
+    bool m_has_attr_alignment;
+
     // child element data
     Kind m_kind;
     DomWidget* m_widget;