From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 25 May 2011 09:27:40 +0000 (+0200)
Subject: uic: Use QString::fromUtf8 for QUrl properties.
X-Git-Tag: qt-v5.0.0-alpha1~4238
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf234e32887567caa27d9aa28aac3a12f09b5f19;p=profile%2Fivi%2Fqtbase.git

uic: Use QString::fromUtf8 for QUrl properties.

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>
---

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 8660991..72da6db 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -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;
         }