summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2012-07-29 01:04:08 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-30 10:43:50 +0200
commitada38c75cccb33947107212c08e7b080e6b54f84 (patch)
tree8abdeecf0fe14eeef52a338687927048082151dd
parent650cdb62bd9879f8e59f773282a3f9113cb03ab0 (diff)
QUrl: document that setIdnWhitelist isn't thread-safe
This is a forward-port of 6b10fc91 from Qt 4. Change-Id: I58878bf24e4f1b50ebfd0457c37eef58696f4a4c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/io/qurlidna.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp
index 5b9ca6ca1b..01497d16ab 100644
--- a/src/corelib/io/qurlidna.cpp
+++ b/src/corelib/io/qurlidna.cpp
@@ -2572,6 +2572,9 @@ QStringList QUrl::idnWhitelist()
Sets the whitelist of Top-Level Domains (TLDs) that are allowed to have
non-ASCII characters in domains to the value of \a list.
+ Note that if you call this function, you need to do so \em before
+ you start any threads that might access idnWhitelist().
+
Qt has comes a default list that contains the Internet top-level domains
that have published support for Internationalized Domain Names (IDNs)
and rules to guarantee that no deception can happen between similarly-looking