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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (68 commits)
  Doc: Updated documentation with \since 4.8 declarations.
  Fix vertical positioning of glyphs in raster engine with FreeType
  Ensure a small event check interval on uikit platform.
  Change default application font for uikit platform.
  Use the QPoint memory layout change only on Desktop Mac
  Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
  Make it compile with openssl 1.0.0d, gcc 4.6
  QStringBuilder: do not crash with null char*
  Add IPHONEOS deployment vars to makespec
  Post key events via QWindowSystemInterface, don't post events direcly
  Use nicer fonts and a few little patches to uikit platform.
  Update README and qmlapplicationviewer to suit 4.8.
  Updated proof-of-concept UIKit mkspecs
  Re-apply licenseheader text in source files for qt4.8
  Fix event delevery order
  Reorder variable to eliminate warnings
  Only compare styleNames if they are not empty
  Add styleName to QFontDef comparison
  qsystemlibrary needs no special treatment
  QSocketNotifier autotest - fix compile with MSVC
  ...

8 files changed, 24 insertions, 5 deletions

diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index ca8cc8a..d791529 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -48,6 +48,11 @@ static QSystemLocale *QSystemLocale_globalSystemLocale();
 QT_END_NAMESPACE
 #endif
 
+#if !defined(QWS) && defined(Q_OS_MAC)
+#   include "private/qcore_mac_p.h"
+#   include <CoreFoundation/CoreFoundation.h>
+#endif
+
 #include "qplatformdefs.h"
 
 #include "qdatastream.h"
@@ -65,10 +70,6 @@ QT_END_NAMESPACE
 #   include "qt_windows.h"
 #   include <time.h>
 #endif
-#if !defined(QWS) && defined(Q_OS_MAC)
-#   include "private/qcore_mac_p.h"
-#   include <CoreFoundation/CoreFoundation.h>
-#endif
 #include "private/qnumeric_p.h"
 #include "private/qsystemlibrary_p.h"
 
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index fd139c3..5d4f305 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -608,6 +608,7 @@
 
 /*!
     \enum QLocale::Script
+    \since 4.8
 
     This enumerated type is used to specify a script.
 
diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp
index bd32fe7..ae6ed71 100644
--- a/src/corelib/tools/qpoint.cpp
+++ b/src/corelib/tools/qpoint.cpp
@@ -188,6 +188,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \fn QPoint &QPoint::operator*=(float factor)
+    \since 4.8
 
     Multiplies this point's coordinates by the given \a factor, and
     returns a reference to this point.
@@ -200,6 +201,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \fn QPoint &QPoint::operator*=(double factor)
+    \since 4.8
 
     Multiplies this point's coordinates by the given \a factor, and
     returns a reference to this point. For example:
@@ -214,6 +216,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \fn QPoint &QPoint::operator*=(int factor)
+    \since 4.8
 
     Multiplies this point's coordinates by the given \a factor, and
     returns a reference to this point.
@@ -259,6 +262,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \fn const QPoint operator*(const QPoint &point, float factor)
     \relates QPoint
+    \since 4.8
 
     Returns a copy of the given \a point multiplied by the given \a factor.
 
@@ -271,6 +275,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \fn const QPoint operator*(const QPoint &point, double factor)
     \relates QPoint
+    \since 4.8
 
     Returns a copy of the given \a point multiplied by the given \a factor.
 
@@ -283,6 +288,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \fn const QPoint operator*(const QPoint &point, int factor)
     \relates QPoint
+    \since 4.8
 
     Returns a copy of the given \a point multiplied by the given \a factor.
 
@@ -293,6 +299,7 @@ QT_BEGIN_NAMESPACE
     \fn const QPoint operator*(float factor, const QPoint &point)
     \overload
     \relates QPoint
+    \since 4.8
 
     Returns a copy of the given \a point multiplied by the given \a factor.
 */
@@ -301,6 +308,7 @@ QT_BEGIN_NAMESPACE
     \fn const QPoint operator*(double factor, const QPoint &point)
     \overload
     \relates QPoint
+    \since 4.8
 
     Returns a copy of the given \a point multiplied by the given \a factor.
 */
@@ -309,6 +317,7 @@ QT_BEGIN_NAMESPACE
     \fn const QPoint operator*(int factor, const QPoint &point)
     \overload
     \relates QPoint
+    \since 4.8
 
     Returns a copy of the given \a point multiplied by the given \a factor.
 */
diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h
index c0cf219..9f03606 100644
--- a/src/corelib/tools/qpoint.h
+++ b/src/corelib/tools/qpoint.h
@@ -93,7 +93,7 @@ public:
 private:
     friend class QTransform;
     // ### Qt 5;  remove the ifdef and just have the same order on all platforms.
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
     int yp;
     int xp;
 #else
diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc
index f562c68..31129e0 100644
--- a/src/corelib/tools/qset.qdoc
+++ b/src/corelib/tools/qset.qdoc
@@ -124,6 +124,7 @@
 
 /*!
     \fn void QSet::swap(QSet<T> &other)
+    \since 4.8
 
     Swaps set \a other with this set. This operation is very fast and
     never fails.
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index ee45cfd..791bfff 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -839,18 +839,21 @@ int QString::grow(int size)
 
 /*!
     \typedef QString::const_reference
+    \since 4.8
 
     The QString::const_reference typedef provides an STL-style
     const reference for QString.
 */
 /*!
     \typedef QString::reference
+    \since 4.8
 
     The QString::const_reference typedef provides an STL-style
     reference for QString.
 */
 /*!
     \typedef QString::value_type
+    \since 4.8
 
     The QString::const_reference typedef provides an STL-style
     value type for QString.
diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp
index 45de6bc..1cc7e5d 100644
--- a/src/corelib/tools/qstringbuilder.cpp
+++ b/src/corelib/tools/qstringbuilder.cpp
@@ -162,6 +162,8 @@ void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out
     }
 #endif
     if (len == -1) {
+        if (!a)
+            return;
         while (*a)
             *out++ = QLatin1Char(*a++);
     } else {
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 709d84a..594ab2f 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -352,6 +352,8 @@ template <> struct QConcatenable<const char *> : private QAbstractConcatenable
 #endif
     static inline void appendTo(const char *a, char *&out)
     {
+        if (!a)
+            return;
         while (*a)
             *out++ = *a++;
     }