Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/tools/qdoc/tree.cpp
	tests/auto/gui/painting/qcolor/tst_qcolor.cpp

Change-Id: Iaa78f601a63191fa643aabf853520f913f2f0fdc

1 files changed, 6 insertions, 1 deletions

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 78f243a6d3..b02e2dc0ed 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -1176,6 +1176,7 @@ void WriteInitialization::writeProperties(const QString &varName,
             continue;
         QString propertyName = p->attributeName();
         QString propertyValue;
+        bool delayProperty = false;
 
         // special case for the property `geometry': Do not use position
         if (isTopLevel && propertyName == QLatin1String("geometry") && p->elementRect()) {
@@ -1204,6 +1205,10 @@ void WriteInitialization::writeProperties(const QString &varName,
                     && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QAxWidget"))) {
             // already done ;)
             continue;
+        } else if (propertyName == QLatin1String("default")
+                   && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QPushButton"))) {
+            // QTBUG-44406: Setting of QPushButton::default needs to be delayed until the parent is set
+            delayProperty = true;
         } else if (propertyName == QLatin1String("database")
                     && p->elementStringList()) {
             // Sql support
@@ -1479,7 +1484,7 @@ void WriteInitialization::writeProperties(const QString &varName,
             else if (propertyName == QLatin1String("accessibleName") || propertyName == QLatin1String("accessibleDescription"))
                 defineC = accessibilityDefineC;
 
-            QTextStream &o = autoTrOutput(p);
+            QTextStream &o = delayProperty ? m_delayedOut : autoTrOutput(p);
 
             if (defineC)
                 openIfndef(o, QLatin1String(defineC));