From 00bf2e2605b97ff77efdcb68b7968375b3e9d195 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 25 May 2011 11:27:40 +0200 Subject: 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 --- src/tools/uic/cpp/cppwriteinitialization.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 37d012c..ab8c9f3 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; } -- cgit v0.12