3 files changed, 8 insertions, 2 deletions
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index 748d918..0be3385 100644
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -82,7 +82,7 @@ static inline QString moduleHeader(const QString &module, const QString &header)
 namespace CPP {
 
 WriteIncludes::WriteIncludes(Uic *uic)
-  : m_uic(uic), m_output(uic->output()), m_scriptsActivated(false)
+    : m_uic(uic), m_output(uic->output()), m_scriptsActivated(false), m_laidOut(false)
 {
     // When possible (no namespace) use the "QtModule/QClass" convention
     // and create a re-mapping of the old header "qclass.h" to it. Do not do this
@@ -106,6 +106,7 @@ WriteIncludes::WriteIncludes(Uic *uic)
 void WriteIncludes::acceptUI(DomUI *node)
 {
     m_scriptsActivated = false;
+    m_laidOut = false;
     m_localIncludes.clear();
     m_globalIncludes.clear();
     m_knownClasses.clear();
@@ -160,6 +161,7 @@ void WriteIncludes::acceptWidget(DomWidget *node)
 void WriteIncludes::acceptLayout(DomLayout *node)
 {
     add(node->attributeClass());
+    m_laidOut = true;
     TreeWalker::acceptLayout(node);
 }
 
@@ -236,6 +238,9 @@ void WriteIncludes::add(const QString &className, bool determineHeader, const QS
 
     m_knownClasses.insert(className);
 
+    if (!m_laidOut && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBox")))
+        add(QLatin1String("QLayout")); // spacing property of QToolBox)
+
     if (className == QLatin1String("Line")) { // ### hmm, deprecate me!
         add(QLatin1String("QFrame"));
         return;
diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h
index 39b1ddf..e821536 100644
--- a/src/tools/uic/cpp/cppwriteincludes.h
+++ b/src/tools/uic/cpp/cppwriteincludes.h
@@ -107,6 +107,7 @@ private:
     StringMap m_oldHeaderToNewHeader;
 
     bool m_scriptsActivated;
+    bool m_laidOut;
 };
 
 } // namespace CPP
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 06d054b..cd8c96c 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -1527,7 +1527,7 @@ void WriteInitialization::writeProperties(const QString &varName,
 
         case DomProperty::Url: {
             const DomUrl* u = p->elementUrl();
-            propertyValue = QString::fromLatin1("QUrl(%1)")
+            propertyValue = QString::fromLatin1("QUrl(QString::fromUtf8(%1))")
                             .arg(fixString(u->elementString()->text(), m_dindent));
             break;
         }