diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-05-25 09:27:40 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-05-25 09:27:40 (GMT) |
| commit | 00bf2e2605b97ff77efdcb68b7968375b3e9d195 (patch) | |
| tree | 14b75c762ab48d866a7b6ab8e5c6845607f3a03b /src/tools | |
| parent | 89f5c035bd3798a0998c3046de643bda0fa8da6b (diff) | |
| download | Qt-00bf2e2605b97ff77efdcb68b7968375b3e9d195.zip Qt-00bf2e2605b97ff77efdcb68b7968375b3e9d195.tar.gz Qt-00bf2e2605b97ff77efdcb68b7968375b3e9d195.tar.bz2 | |
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>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |