uic: Use QString::fromUtf8 for QUrl properties.
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Wed, 25 May 2011 09:27:40 +0000 (11:27 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 27 May 2011 10:12:17 +0000 (12:12 +0200)
As otherwise the compilation of ui_-files fails when
using QT_NO_CAST_FROM_ASCII. Bug reported on mailing list.

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Change-Id: I00bf2e2605b97ff77efdcb68b7968375b3e9d195
(cherry picked from commit 00bf2e2605b97ff77efdcb68b7968375b3e9d195)
Reviewed-on: http://codereview.qt.nokia.com/174
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
src/tools/uic/cpp/cppwriteinitialization.cpp

index 8660991..72da6db 100644 (file)
@@ -1452,7 +1452,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;
         }