summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qurl.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-06-08 01:58:11 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-21 00:31:48 (GMT)
commit58507f6bdf32262dcb56d4d2c0c8c8a0812967b7 (patch)
treefd58414e6ea0dff6bfac0dee8407dc13e3904196 /src/corelib/io/qurl.cpp
parent6827a3aa2bc852152cd3353be9558c683fb3085c (diff)
downloadQt-58507f6bdf32262dcb56d4d2c0c8c8a0812967b7.zip
Qt-58507f6bdf32262dcb56d4d2c0c8c8a0812967b7.tar.gz
Qt-58507f6bdf32262dcb56d4d2c0c8c8a0812967b7.tar.bz2
QUrl stringprep: avoid recalculating the surrogates we already know
(cherry-picked from qtbase commit 53388cd8e0451ea375ed250b59f9e89319fb3e1c) Change-Id: Icac4e81fff6f7f7fa4f46ec2a08105f8d3d2b403 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/corelib/io/qurl.cpp')
-rw-r--r--src/corelib/io/qurl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 3dc9568..af0dfa7 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -3012,8 +3012,8 @@ void qt_nameprep(QString *source, int from)
if (uc <= 0xFFFF) {
*out++ = *in;
} else {
- *out++ = QChar::highSurrogate(uc);
- *out++ = QChar::lowSurrogate(uc);
+ *out++ = in[-1];
+ *out++ = in[0];
}
}
}