Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/io/qsettings.cpp
	src/corelib/itemmodels/qstringlistmodel.cpp
	tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp

Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03

5 files changed, 18 insertions, 15 deletions

diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp
index a7ab8b9e70..7db0920a29 100644
--- a/src/corelib/tools/qcommandlineparser.cpp
+++ b/src/corelib/tools/qcommandlineparser.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+extern void Q_CORE_EXPORT qt_call_post_routines();
+
 typedef QHash<QString, int> NameHash_t;
 
 class QCommandLineParserPrivate
@@ -586,6 +588,7 @@ void QCommandLineParser::process(const QStringList &arguments)
 {
     if (!d->parse(arguments)) {
         showParserMessage(errorText() + QLatin1Char('\n'), ErrorMessage);
+        qt_call_post_routines();
         ::exit(EXIT_FAILURE);
     }
 
@@ -997,6 +1000,7 @@ Q_NORETURN void QCommandLineParser::showVersion()
     showParserMessage(QCoreApplication::applicationName() + QLatin1Char(' ')
                       + QCoreApplication::applicationVersion() + QLatin1Char('\n'),
                       UsageMessage);
+    qt_call_post_routines();
     ::exit(EXIT_SUCCESS);
 }
 
@@ -1014,6 +1018,7 @@ Q_NORETURN void QCommandLineParser::showVersion()
 Q_NORETURN void QCommandLineParser::showHelp(int exitCode)
 {
     showParserMessage(d->helpText(), UsageMessage);
+    qt_call_post_routines();
     ::exit(exitCode);
 }
 
diff --git a/src/corelib/tools/qdatetimeparser.cpp b/src/corelib/tools/qdatetimeparser.cpp
index 9c9009d636..36ab93df1e 100644
--- a/src/corelib/tools/qdatetimeparser.cpp
+++ b/src/corelib/tools/qdatetimeparser.cpp
@@ -1722,11 +1722,9 @@ QDateTime QDateTimeParser::getMaximum() const
 
 QString QDateTimeParser::getAmPmText(AmPm ap, Case cs) const
 {
-    if (ap == AmText) {
-        return (cs == UpperCase ? tr("AM") : tr("am"));
-    } else {
-        return (cs == UpperCase ? tr("PM") : tr("pm"));
-    }
+    const QLocale loc = locale();
+    QString raw = ap == AmText ? loc.amText() : loc.pmText();
+    return cs == UpperCase ? raw.toUpper() : raw.toLower();
 }
 
 /*
diff --git a/src/corelib/tools/qelapsedtimer.cpp b/src/corelib/tools/qelapsedtimer.cpp
index 2eabb4c3a3..addecc0236 100644
--- a/src/corelib/tools/qelapsedtimer.cpp
+++ b/src/corelib/tools/qelapsedtimer.cpp
@@ -137,7 +137,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 (OS X and iOS). This clock is monotonic and does not overflow.
+    \value MachAbsoluteTime   The Mach kernel's absolute time (\macos 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
@@ -179,8 +179,8 @@ QT_BEGIN_NAMESPACE
     \section2 MachAbsoluteTime
 
     This clock type is based on the absolute time presented by Mach kernels,
-    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
+    such as that found on \macos. This clock type is presented separately
+    from MonotonicClock since \macos 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/qelapsedtimer_generic.cpp b/src/corelib/tools/qelapsedtimer_generic.cpp
index 8c724247be..29ba1517ed 100644
--- a/src/corelib/tools/qelapsedtimer_generic.cpp
+++ b/src/corelib/tools/qelapsedtimer_generic.cpp
@@ -145,7 +145,7 @@ qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW
     number of milliseconds since January 1st, 1970 at 0:00 UTC (that is, it
     is the Unix time expressed in milliseconds).
 
-    On Linux, Windows and OS X/iOS systems, this value is usually the time
+    On Linux, Windows and Apple platforms, this value is usually the time
     since the system boot, though it usually does not include the time the
     system has spent in sleep states.
 
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index dd1d296856..69fd4f1e52 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -5495,7 +5495,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 OS X and iOS this function compares according the
+    On \macos and iOS this function compares according the
     "Order for sorted lists" setting in the International preferences panel.
 
     \sa compare(), QLocale
@@ -7989,7 +7989,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 OS X and iOS.
+    \note this function is only available on \macos and iOS.
 */
 
 /*! \fn CFStringRef QString::toCFString() const
@@ -7998,7 +7998,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 OS X and iOS.
+    \note this function is only available on \macos and iOS.
 */
 
 /*! \fn QString QString::fromNSString(const NSString *string)
@@ -8006,7 +8006,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 OS X and iOS.
+    \note this function is only available on \macos and iOS.
 */
 
 /*! \fn NSString QString::toNSString() const
@@ -8014,7 +8014,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 OS X and iOS.
+    \note this function is only available on \macos and iOS.
 */
 
 /*! \fn bool QString::isSimpleText() const
@@ -9409,7 +9409,7 @@ QStringRef QStringRef::appendTo(QString *string) const
     platform-dependent manner. Use this function to present sorted
     lists of strings to the user.
 
-    On OS X and iOS, this function compares according the
+    On \macos and iOS, this function compares according the
     "Order for sorted lists" setting in the International prefereces panel.
 
     \sa compare(), QLocale