diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-02-13 09:35:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-13 09:35:08 +0100 |
| commit | 7ac97d7efb1a1e75633ce31fbb03eb43a9b01670 (patch) | |
| tree | 4284e5eff68c13cc52be1c658d6c2abffee3ece5 /src/corelib/io/qurlidna.cpp | |
| parent | 5b14bf342f43bd6cb02ad751db8da851850814bb (diff) | |
| parent | a9c88c1f39c41215eb9d7288a1fd02aa865e8a04 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/io/qurlidna.cpp')
| -rw-r--r-- | src/corelib/io/qurlidna.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp index bf2c07e0e0..4e9b257c7b 100644 --- a/src/corelib/io/qurlidna.cpp +++ b/src/corelib/io/qurlidna.cpp @@ -2603,7 +2603,7 @@ QStringList QUrl::idnWhitelist() Note that if you call this function, you need to do so \e before you start any threads that might access idnWhitelist(). - Qt has comes a default list that contains the Internet top-level domains + Qt comes with 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 characters (such as the Latin lowercase letter \c 'a' and the Cyrillic |