diff options
| author | Jeff Tranter <jtranter@ics.com> | 2013-12-24 11:44:39 -0500 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-02 17:21:09 +0100 |
| commit | 2e8c3f744407607a522abe25abd21ec733365793 (patch) | |
| tree | aa37ab17790ae754b38e48bc32704619ee6e5e16 /src/corelib/tools | |
| parent | 97c1b2d32ed06a186ce2f0f342c8d056ddb987a2 (diff) | |
Fix some typos in documentation.
Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code.
Change-Id: I2e946fda0bd9a2117f8e9b2fb300df9bf0a98a6c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qalgorithms.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qtimezone.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc index 412b9cf3b2..40eb2ed41d 100644 --- a/src/corelib/tools/qalgorithms.qdoc +++ b/src/corelib/tools/qalgorithms.qdoc @@ -534,7 +534,7 @@ Use std::lower_bound instead. Performs a binary search of the range [\a begin, \a end) and - returns the position of the first ocurrence of \a value. If no + returns the position of the first occurrence of \a value. If no such item is found, returns the position where it should be inserted. diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp index 5fec06b30a..a8ed8739c3 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/tools/qtimezone.cpp @@ -185,7 +185,7 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz); The method systemTimeZoneId() returns the current system IANA time zone ID which on OSX and Linux will always be correct. On Windows this ID is - translated from the the Windows system ID using an internal translation + translated from the Windows system ID using an internal translation table and the user's selected country. As a consequence there is a small chance any Windows install may have IDs not known by Qt, in which case "UTC" will be returned. @@ -771,7 +771,7 @@ QTimeZone::OffsetDataList QTimeZone::transitions(const QDateTime &fromDateTime, /*! Returns the current system time zone IANA ID. - On Windows this ID is translated from the the Windows ID using an internal + On Windows this ID is translated from the Windows ID using an internal translation table and the user's selected country. As a consequence there is a small chance any Windows install may have IDs not known by Qt, in which case "UTC" will be returned. |