summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qlocale.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add QLocale::toUpper/LowerLars Knoll2011-07-121-0/+38
| | | | | | | | | | | The toUpper/Lower() methods in QString should not be locale dependent, as this can lead to rather hard to find bugs in at least a turkish locale. Rather have explicit, locale dependend case conversions available in QLocale. Reviewed-by: Denis Dzyubenko
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-271-4/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue When asking for relations, don't crash on children that don't return an interface. Remove more inconsistencies with invisible. QAccessibleToolButton::text should return accessibleName if set. Remove stray semicolon. Do not expose text when echo mode is not Normal. Check validator when changing text using accessibility functions. Fix some issues introduced in df6713b8f55fc007796f40. Add tilde (both ~ and ~<userName>) expansion to QFileDialog on UNIX. Avoid bogus accessibility focus events from menus. Build fix for Mac OS 10.5 Avoided calling updateAccessibility() from updateMicroFocus if the item was hidden Notify a11y framework of FocusChanges for QGraphicsObject Call updateAccessibility on the QGraphicsObject in updateMicroFocus Fix updateAccessibility for QGraphicsObjects Make accessibility work on Windows with alien
| * Merge remote-tracking branch 'upstream/4.8' into 4.8Frederik Gladhorn2011-06-121-32/+39
| |\
| * | Build fix for Mac OS 10.5Richard Moe Gustavsen2011-06-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build breaks because QString defines a template function that interferes with a system header. The easy fix is to just make sure we include the system headers before any Qt headers. This fix turned out to already be in for Qt5, but that change contained other stuff as well, and were not suited for cherry-picking. Rev-By: msorvig
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-171-13/+22
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-06-071-4/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (25 commits) Horizontal lines appearing under entered characters Move qts60plugindeployment rule to correct scope Skipping tst_QEventLoop::processEventsExcludeSocket for qws Fixed compile of tst_qscriptextensionplugin on some Windows configurations QS60Style: Checked state is not shown on highlighted itemview item Removing unused code after introduction of round robin scheduler tst_qeventloop runs the event loop to ensure socket messages arrive Schedule Symbian active objects with a round robin scheduler Fix the build break for QUrl autotest on Symbian Fixed def files for WINSCW Fixed def files for ARMV5 Fix the build break for QStyleSheetStyle autotest on Symbian Fix bug about daylight saving missing on Symbian platfrom. Fix the build break caused by the missing parameter for QSKIP macro. Document the Symbian main window size issue at application start. QS60Style: icon is not shown correctly in a menu item in all cases QS60Style: Remove 3.x specific code from style Fix Coverity issues found from QS60Style Removed qts60plugin references also from config.profiles Remove s60 plugin dll from the iby file too. ...
| | * \ Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-231-17/+17
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/s60/src/qcoreapplication_3_1.cpp src/plugins/s60/src/qcoreapplication_3_2.cpp src/plugins/s60/src/qdesktopservices_3_1.cpp src/plugins/s60/src/qdesktopservices_3_2.cpp src/plugins/s60/src/qlocale_3_1.cpp src/plugins/s60/src/qlocale_3_2.cpp
| | * | | Remove S60 version pluginsMiikka Heikkinen2011-05-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S60 version plugins serve no purpose now that S60 3.x support has been dropped, so remove them to improve performance. Task-number: QTBUG-18614 Reviewed-by: Janne Koskinen
| * | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-241-17/+17
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Improved performance of the QLocale::name() function.Denis Dzyubenko2011-05-201-9/+22
| | |/ / | |/| | | | | | | | | | | | | | Task-number: QTBUG-19168 Reviewed-by: Zeno Albisser
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-241-17/+17
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| |/ / | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Doc: Applied pending fixes to API documentation.David Boddie2011-05-111-1/+1
|/ /
* | Fixes warningsOlivier Goffart2011-04-281-2/+0
|/ | | | | | | | | | In QString, it would comlain that: assuming signed overflow does not occur when assuming that (X - c) > X is always false Changing to unsigned comparison fix the warning Others are about unused variables Reviewed-by: Thiago
* Added support for libICU for collation and toLower/toUpper.Denis Dzyubenko2011-04-121-0/+14
| | | | | | | | | | | This patch uses icu to do string collation via QString::localeAwareCompare function and for QString::toLower/toUpper - which is important e.g. for turkish locales where uppercased 'i' is not a latin 'I'. Based on the patch by Harald Fernengel Reviewed-by: Harald Fernengel Reviewed-by: Zeno Albisser
* Fixed checking for default arguments in QLocale::toCurrencyString()Denis Dzyubenko2011-03-291-3/+3
| | | | | | | We should check whether we got the default argument or the empty string that was provided by the user as toCurrencyString(123, QString("")) Reviewed-by: Zeno Albisser
* Added native language and country names (endonyms) to QLocale.Denis Dzyubenko2011-03-291-0/+40
| | | | | | Task-number: QTBUG-17092 Reviewed-by: Zeno Albisser Reviewed-by: Liang Qi
* Changed the return value of QLocale::matchingLocales().Denis Dzyubenko2011-03-281-8/+10
| | | | | | | Instead of returning a QStringList, return the list of QLocale objects that can be used directly. Reviewed-by: axis
* Fixed documentation for QLocaleDenis Dzyubenko2011-03-241-16/+15
| | | | Reviewed-by: trustme
* QLocale fixes.Denis Dzyubenko2011-03-241-12/+12
| | | | | | Prepended non-static functions with a qt_ prefix as our policy says. Reviewed-by: trustme
* Bugfixing QLocale::weekdays and updating manual testZeno Albisser2011-03-221-7/+3
| | | | Reviewed-by: Denis Dzyubenko
* replaced weekendStart and weekendEnd with weekdays functionZeno Albisser2011-03-211-21/+16
| | | | | Reviewed-by: Denis Dzyubenko Task-number: QTBUG-17088
* Merge branch 'master-i18n' of scm.dev.nokia.troll.no:qt/qt-earth-team into ↵Denis Dzyubenko2011-03-171-0/+39
|\ | | | | | | | | | | | | master-i18n Conflicts: src/corelib/tools/qlocale.h
| * Using list patterns to get a string from list in QLocale.Liang Qi2011-03-081-0/+39
| | | | | | | | | | Reviewed-by: Denis Dzyubenko Task-number: QTBUG-17097
* | Refactored QLocale on Windows.Denis Dzyubenko2011-03-171-0/+4
| | | | | | | | | | | | | | | | Added LocaleChanged system locale enum that is queried whenever we detect that the system locale is changed. This should make it easier to have cached values in the system locale implementations. Reviewed-by: Zeno Albisser
* | Improved QLocale::quoteString.Denis Dzyubenko2011-03-071-4/+3
| | | | | | | | | | | | | | Whenever the system locale doesn't return the proper alternate quotes we should try the standard quotes before falling back to the CLDR data. Reviewed-by: trustme
* | Extended documentation for QLocale.Denis Dzyubenko2011-03-041-9/+28
|/ | | | Reviewed-by: axis
* Fixed spelling in the comment.Denis Dzyubenko2011-03-041-1/+1
| | | | Reviewed-by: trustme
* Fixed parsing on the locale name in QLocale.Denis Dzyubenko2011-03-031-2/+8
| | | | | | Fixes QLocale autotests on Windows. Reviewed-by: trustme
* Added writing script support to QLocale.Denis Dzyubenko2011-03-021-109/+318
| | | | | Task-number: QTBUG-17105 Reviewed-by: trustme
* Use the localized represantion of AM/PM string when converting time.Denis Dzyubenko2011-03-011-2/+2
| | | | Reviewed-by: Liang Qi
* Fixed documentation for QLocaleDenis Dzyubenko2011-02-251-40/+8
| | | | | | Also added a forgotten license header for qlocale.qdoc Reviewed-by: trustme
* Improved currency value to string conversion in QLocale.Denis Dzyubenko2011-02-251-24/+34
| | | | | | | | | | Added a second, optional, argument to QLocale::toCurrencyString() that represents a currency symbol that is supposed to be added to the formatted string. Task-number: QTBUG-17100 Reviewed-by: Zeno Albisser Reviewed-by: Olivier Goffart
* fixed QLocale::quoteString() to allow for QSystemLocale implementationZeno Albisser2011-02-251-6/+9
| | | | | Reviewed-by: Denis Dzyubenko Task-number: QTBUG-17096
* Improved QLocale apiDenis Dzyubenko2011-02-251-3/+3
| | | | | | | Renames FormatCurrency enum value to CurrencyToString to match other enums. Task-number: related to QTBUG-17100 Reviewed-by: trustme
* Merge branch 'master-i18n' of scm.dev.nokia.troll.no:qt/qt-earth-team into ↵Denis Dzyubenko2011-02-241-0/+34
|\ | | | | | | | | | | | | master-i18n Conflicts: src/corelib/tools/qlocale.cpp
| * Implemented QLocale::weekendStart and QLocale::weekendEndZeno Albisser2011-02-241-1/+37
| | | | | | | | | | Reviewed-by: Denis Dzyubenko Task-number: QTBUG-17088
* | QLocale improvements on unix/linux.Denis Dzyubenko2011-02-241-24/+14
| | | | | | | | | | | | There is no reason to re-read environment variables all the time. Reviewed-by: Zeno Albisser
* | Split monolithic qlocale.cpp into platform-specific filesDenis Dzyubenko2011-02-241-5088/+16
|/ | | | | | | This is just a refactoring change to split huge unreadable qlocale.cpp into multiple files. Reviewed-by: Zeno Albisser
* QLocale: Compile fix on WindowsDenis Dzyubenko2011-02-231-0/+4
| | | | Reviewed-by: trustme
* Compile fix.Denis Dzyubenko2011-02-231-2/+2
| | | | Reviewed-by: trustme
* QLocale: Supporting multiple locale categories on Unix.Denis Dzyubenko2011-02-231-13/+132
| | | | | | | This patch adds support for LC_* environment variables on Unix. Reviewed-by: Thiago Macieira Reviewed-by: Olivier Goffart
* Added UI languages property to QLocaleDenis Dzyubenko2011-02-231-4/+129
| | | | | | | | The return value is a sorted list of locale names that could be used for presenting data to the user (i.e. for translations). Task-number: QTBUG-7329 Reviewed-by: Zeno Albisser
* Added documentation for enum value FirstDayOfWeekZeno Albisser2011-02-221-0/+1
| | | | Reviewed-by: trustme
* Implemented QLocale::quoteString(...)Zeno Albisser2011-02-221-0/+86
| | | | | Reviewed-by: Denis Dzyubenko Task-number: QTBUG-17096
* Merge remote branch 'earth-team/4.7-i18n' into master-i18nDenis Dzyubenko2011-02-211-2/+4
|\
| * Fixes QLocale locale name parsing.Denis Dzyubenko2011-02-031-2/+4
| | | | | | | | | | | | | | | | | | Allow BCP47 dash as a language-country separator. This only changes it one way - parsing 'en-US' will work, but QLocale::name() will still return name with underscore as separator. Task-number: QTBUG-15835 Reviewed-by: João Abecasis