8 files changed, 32 insertions, 37 deletions
diff --git a/src/corelib/tools/qbytearraylist.h b/src/corelib/tools/qbytearraylist.h
index 9cd241a87b..f8539ca07a 100644
--- a/src/corelib/tools/qbytearraylist.h
+++ b/src/corelib/tools/qbytearraylist.h
@@ -55,6 +55,10 @@ class QByteArrayList : public QList<QByteArray>
 template <> struct QListSpecialMethods<QByteArray>
 #endif
 {
+#ifndef Q_QDOC
+protected:
+    ~QListSpecialMethods() {}
+#endif
 public:
     inline QByteArray join() const
     { return QtPrivate::QByteArrayList_join(self(), 0, 0); }
diff --git a/src/corelib/tools/qelapsedtimer.cpp b/src/corelib/tools/qelapsedtimer.cpp
index 82f890478d..41e8b4854d 100644
--- a/src/corelib/tools/qelapsedtimer.cpp
+++ b/src/corelib/tools/qelapsedtimer.cpp
@@ -131,7 +131,7 @@ QT_BEGIN_NAMESPACE
     \value SystemTime         The human-readable system time. This clock is not monotonic.
     \value MonotonicClock     The system's monotonic clock, usually found in Unix systems. This clock is monotonic and does not overflow.
     \value TickCounter        The system's tick counter, used on Windows systems. This clock may overflow.
-    \value MachAbsoluteTime   The Mach kernel's absolute time (Mac OS X). This clock is monotonic and does not overflow.
+    \value MachAbsoluteTime   The Mach kernel's absolute time (OS X and iOS). This clock is monotonic and does not overflow.
     \value PerformanceCounter The high-resolution performance counter provided by Windows. This clock is monotonic and does not overflow.
 
     \section2 SystemTime
@@ -173,8 +173,8 @@ QT_BEGIN_NAMESPACE
     \section2 MachAbsoluteTime
 
     This clock type is based on the absolute time presented by Mach kernels,
-    such as that found on Mac OS X. This clock type is presented separately
-    from MonotonicClock since Mac OS X is also a Unix system and may support
+    such as that found on OS X. This clock type is presented separately
+    from MonotonicClock since OS X and iOS are also Unix systems and may support
     a POSIX monotonic clock with values differing from the Mach absolute
     time.
 
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index 85e4570f45..1e002633df 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -63,8 +63,13 @@ QT_BEGIN_NAMESPACE
 template <typename T> class QVector;
 template <typename T> class QSet;
 
-template <typename T> struct QListSpecialMethods { };
+template <typename T> struct QListSpecialMethods
+{
+protected:
+    ~QListSpecialMethods() {}
+};
 template <> struct QListSpecialMethods<QByteArray>;
+template <> struct QListSpecialMethods<QString>;
 
 struct Q_CORE_EXPORT QListData {
     // tags for tag-dispatching of QList implementations,
diff --git a/src/corelib/tools/qscopedvaluerollback.h b/src/corelib/tools/qscopedvaluerollback.h
index 66110b88f6..2db2ad869c 100644
--- a/src/corelib/tools/qscopedvaluerollback.h
+++ b/src/corelib/tools/qscopedvaluerollback.h
@@ -43,21 +43,19 @@ class QScopedValueRollback
 {
 public:
     explicit QScopedValueRollback(T &var) :
-        varRef(var)
+        varRef(var), oldValue(var)
     {
-        oldValue = varRef;
     }
 
     explicit QScopedValueRollback(T &var, T value) :
-        varRef(var)
+        varRef(var), oldValue(var)
     {
-        oldValue = varRef;
-        varRef = value;
+        varRef = qMove(value);
     }
 
     ~QScopedValueRollback()
     {
-        varRef = oldValue;
+        varRef = qMove(oldValue);
     }
 
     void commit()
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 63139c97fd..373d25c6ad 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -5348,7 +5348,7 @@ int QString::compare_helper(const QChar *data1, int length1, QLatin1String s2,
     platform-dependent manner. Use this function to present sorted
     lists of strings to the user.
 
-    On Mac OS X since Qt 4.3, this function compares according the
+    On OS X and iOS this function compares according the
     "Order for sorted lists" setting in the International preferences panel.
 
     \sa compare(), QLocale
@@ -7816,7 +7816,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
 
     Constructs a new QString containing a copy of the \a string CFString.
 
-    \note this function is only available on Mac OS X and iOS.
+    \note this function is only available on OS X and iOS.
 */
 
 /*! \fn CFStringRef QString::toCFString() const
@@ -7825,7 +7825,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
     Creates a CFString from a QString. The caller owns the CFString and is
     responsible for releasing it.
 
-    \note this function is only available on Mac OS X and iOS.
+    \note this function is only available on OS X and iOS.
 */
 
 /*! \fn QString QString::fromNSString(const NSString *string)
@@ -7833,7 +7833,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
 
     Constructs a new QString containing a copy of the \a string NSString.
 
-    \note this function is only available on Mac OS X and iOS.
+    \note this function is only available on OS X and iOS.
 */
 
 /*! \fn NSString QString::toNSString() const
@@ -7841,7 +7841,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
 
     Creates a NSString from a QString. The NSString is autoreleased.
 
-    \note this function is only available on Mac OS X and iOS.
+    \note this function is only available on OS X and iOS.
 */
 
 /*! \fn bool QString::isSimpleText() const
@@ -9052,7 +9052,7 @@ QStringRef QStringRef::appendTo(QString *string) const
     platform-dependent manner. Use this function to present sorted
     lists of strings to the user.
 
-    On Mac OS X, this function compares according the
+    On OS X and iOS, this function compares according the
     "Order for sorted lists" setting in the International prefereces panel.
 
     \sa compare(), QLocale
diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h
index 89785208c8..8288e430fa 100644
--- a/src/corelib/tools/qstringlist.h
+++ b/src/corelib/tools/qstringlist.h
@@ -57,6 +57,10 @@ class QStringList : public QList<QString>
 template <> struct QListSpecialMethods<QString>
 #endif
 {
+#ifndef Q_QDOC
+protected:
+    ~QListSpecialMethods() {}
+#endif
 public:
     inline void sort(Qt::CaseSensitivity cs = Qt::CaseSensitive);
     inline int removeDuplicates();
diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h
index 388e88d641..21139b37a8 100644
--- a/src/corelib/tools/qtimeline.h
+++ b/src/corelib/tools/qtimeline.h
@@ -115,26 +115,10 @@ public Q_SLOTS:
     void toggleDirection();
 
 Q_SIGNALS:
-    void valueChanged(qreal x
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void frameChanged(int
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void stateChanged(QTimeLine::State newState
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void finished(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
+    void valueChanged(qreal x, QPrivateSignal);
+    void frameChanged(int, QPrivateSignal);
+    void stateChanged(QTimeLine::State newState, QPrivateSignal);
+    void finished(QPrivateSignal);
 
 protected:
     void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp
index c2ee99a2d8..3627045a40 100644
--- a/src/corelib/tools/qtimezone.cpp
+++ b/src/corelib/tools/qtimezone.cpp
@@ -183,7 +183,7 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz);
     given moment then you should use a Qt::TimeSpec of Qt::LocalTime.
 
     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
+    ID which on Unix-like systems will always be correct.  On Windows this ID is
     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