diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-02-24 17:21:08 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-02-24 17:21:08 (GMT) |
| commit | c64c722945df4b56d51de4b7d629129ff98f2d9e (patch) | |
| tree | eec26de18b3d4f6de46c3e9924be0894b906b57e /src/corelib/tools/qlocale.qdoc | |
| parent | 2cbeb6c08cb7c79d6126f75c2cbc470679d671e1 (diff) | |
| parent | 87bffe501cf21cbdc3394435f397cbc0da9c50d6 (diff) | |
| download | Qt-c64c722945df4b56d51de4b7d629129ff98f2d9e.zip Qt-c64c722945df4b56d51de4b7d629129ff98f2d9e.tar.gz Qt-c64c722945df4b56d51de4b7d629129ff98f2d9e.tar.bz2 | |
Merge branch 'master-i18n' of scm.dev.nokia.troll.no:qt/qt-earth-team into master-i18n
Conflicts:
src/corelib/tools/qlocale.cpp
Diffstat (limited to 'src/corelib/tools/qlocale.qdoc')
| -rw-r--r-- | src/corelib/tools/qlocale.qdoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc index 3231951..8c036c3 100644 --- a/src/corelib/tools/qlocale.qdoc +++ b/src/corelib/tools/qlocale.qdoc @@ -712,6 +712,8 @@ \value UILanguages a list of strings representing locale names that could be used for UI translation. \value QuotationBegin a QString specifying the start of a quotation. the in variant contains a QLocale::QuotationStyle \value QuotationEnd a QString specifying the end of a quotation. the in variant contains a QLocale::QuotationStyle + \value WeekendStart a Qt::DayOfWeek enum specifying the first day of the weekend + \value WeekendEnd a Qt::DayOfWeek enum specifying the last day of the weekend */ /*! |