Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/gui/kernel/qguiapplication.cpp

Change-Id: Ibe75603dc8a51769db6550ea3f07bc8d19b0be85

2 files changed, 10 insertions, 8 deletions

diff --git a/src/corelib/io/qtemporarydir.cpp b/src/corelib/io/qtemporarydir.cpp
index 2c526847b4..1e615956d7 100644
--- a/src/corelib/io/qtemporarydir.cpp
+++ b/src/corelib/io/qtemporarydir.cpp
@@ -218,25 +218,25 @@ QTemporaryDir::QTemporaryDir()
 }
 
 /*!
-    Constructs a QTemporaryFile with a template name of \a templateName.
+    Constructs a QTemporaryDir with a template of \a templatePath.
 
-    If \a templateName is a relative path, the path will be relative to the
+    If \a templatePath is a relative path, the path will be relative to the
     current working directory. You can use QDir::tempPath() to construct \a
-    templateName if you want use the system's temporary directory.
+    templatePath if you want use the system's temporary directory.
 
-    If the \a templateName ends with XXXXXX it will be used as the dynamic portion
+    If the \a templatePath ends with XXXXXX it will be used as the dynamic portion
     of the directory name, otherwise it will be appended.
     Unlike QTemporaryFile, XXXXXX in the middle of the template string is not supported.
 
     \sa QDir::tempPath()
 */
-QTemporaryDir::QTemporaryDir(const QString &templateName)
+QTemporaryDir::QTemporaryDir(const QString &templatePath)
     : d_ptr(new QTemporaryDirPrivate)
 {
-    if (templateName.isEmpty())
+    if (templatePath.isEmpty())
         d_ptr->create(defaultTemplateName());
     else
-        d_ptr->create(templateName);
+        d_ptr->create(templatePath);
 }
 
 /*!
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index 163b087436..288a939ab2 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -569,7 +569,9 @@ void QTextStreamPrivate::flushWriteBuffer()
 #endif
 
     // convert from unicode to raw data
-    QByteArray data = codec->fromUnicode(writeBuffer.data(), writeBuffer.size(), &writeConverterState);
+    // codec might be null if we're already inside global destructors (QTestCodec::codecForLocale returned null)
+    QByteArray data = Q_LIKELY(codec) ? codec->fromUnicode(writeBuffer.data(), writeBuffer.size(), &writeConverterState)
+                                      : writeBuffer.toLatin1();
 #else
     QByteArray data = writeBuffer.toLocal8Bit();
 #endif