summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-02-02 17:13:54 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-02 17:18:46 +0100
commit71002f830b1ac0a476d449553a065a73b8f8ac22 (patch)
treedc37ba4b05562aebf0cb926e99252cf925e33140 /src
parent920795e99a05d1dc419cee88f1b0b2dcd3473dfc (diff)
Build with QT_NO_CAST_FROM_BYTEARRAY
Change-Id: Ibb79e372a3adf90c9f982f50ab711066063eff4a Reviewed-by: David Faure <faure@kde.org>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qurl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index fefd9a328a..c301d92dfb 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -212,9 +212,9 @@ public:
#if QT_DEPRECATED_SINCE(5,0)
QT_DEPRECATED void setEncodedUrl(const QByteArray &url, ParsingMode mode = TolerantMode)
- { setUrl(QString::fromUtf8(url), mode); }
+ { setUrl(QString::fromUtf8(url.constData(), url.size()), mode); }
QT_DEPRECATED static QUrl fromEncoded(const QByteArray &url, ParsingMode mode = TolerantMode)
- { return QUrl(QString::fromUtf8(url), mode); }
+ { return QUrl(QString::fromUtf8(url.constData(), url.size()), mode); }
#endif
private: