Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (120 commits)
  Disable autotest broken by the change to QCache in 7ab0bed
  Generate glyphs in un-transformed coordinate system.
  Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
  Reset trailingSpaces in relayout
  Prevent QPixmapCache potentially growing indefinitely.
  Allocate 16-byte aligned memory independent of platform for raster pool.
  Fix trailing spaces problem by not adding it to QScriptLine.length
  fix build for desktop
  Dragging in nested views no longer works as expected
  Fix the build with -qtnamespace configure options
  Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)
  Fix implicit height not growing when pre-edit text wraps.
  Removed the unnecessary dependency of the QtHelp module on the QtXml one
  Modified \since command behavior slightly to handle project and version.
  Added an additional check to workaround an issue on Windows.
  Fix leak in State element.
  Fix leak in bindings created by PropertyChanges.
  Revert readonly BorderImage::sourceSize change
  URLs used with scheme handler use appropriate encoding for scheme
  Update license headers
  ...

1 files changed, 4 insertions, 2 deletions

diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index d915989..e1b4232 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -1538,7 +1538,7 @@ int QTime::msec() const
 
     If \a format is Qt::ISODate, the string format corresponds to the
     ISO 8601 extended specification for representations of dates,
-    which is also HH:MM:SS. (However, contrary to ISO 8601, dates
+    which is also HH:mm:ss. (However, contrary to ISO 8601, dates
     before 15 October 1582 are handled as Julian dates, not Gregorian
     dates. See \l{QDate G and J} {Use of Gregorian and Julian
     Calendars}. This might change in a future version of Qt.)
@@ -2461,7 +2461,7 @@ void QDateTime::setTime_t(uint secsSince1Jan1970UTC)
 
     If the \a format is Qt::ISODate, the string format corresponds
     to the ISO 8601 extended specification for representations of
-    dates and times, taking the form YYYY-MM-DDTHH:MM:SS[Z|[+|-]HH:MM],
+    dates and times, taking the form YYYY-MM-DDTHH:mm:ss[Z|[+|-]HH:mm],
     depending on the timeSpec() of the QDateTime. If the timeSpec()
     is Qt::UTC, Z will be appended to the string; if the timeSpec() is
     Qt::OffsetFromUTC the offset in hours and minutes from UTC will
@@ -2788,6 +2788,8 @@ int QDateTime::secsTo(const QDateTime &other) const
 }
 
 /*!
+    \since 4.7
+
     Returns the number of milliseconds from this datetime to the \a other
     datetime. If the \a other datetime is earlier than this datetime,
     the value returned is negative.