diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-23 10:11:11 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-23 10:11:11 (GMT) |
| commit | a315c693d0f3dd64711b8459d86b89ddc48e8c1a (patch) | |
| tree | 8f966269d797f97d41847c5bb7283297cee20b47 /src/corelib/tools | |
| parent | d37a3529ec883985b2967265f0797d749db74308 (diff) | |
| parent | e6694ebe4081b807b1bb0946e17e73840019ec6d (diff) | |
| download | Qt-a315c693d0f3dd64711b8459d86b89ddc48e8c1a.zip Qt-a315c693d0f3dd64711b8459d86b89ddc48e8c1a.tar.gz Qt-a315c693d0f3dd64711b8459d86b89ddc48e8c1a.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/s60main/newallocator_hook.cpp
tools/runonphone/serenum_unix.cpp
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 83d6dcd..b817eb2 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -1576,8 +1576,6 @@ QDataStream &operator>>(QDataStream &ds, QLocale &l) defaults to the default locale (see setDefault()). \endlist - The "C" locale is identical in behavior to \l{English}/\l{UnitedStates}. - Use language() and country() to determine the actual language and country values used. |