summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-03-26 08:24:59 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-03-26 08:24:59 +0100
commit7f635d9777baf4af85a2575de123a75ec58bda78 (patch)
tree90ef3a223f8b0b1601f8e72a3adce6f4513fe2dd /src/corelib/io
parentd0f016ebfb86fcebcf72c37c489260a0d02147e7 (diff)
parent945198fd237a83348feb4537d811565a2c2cd8e0 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qtemporaryfile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index 35bb465a04..ced08a9a87 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -908,8 +908,8 @@ QTemporaryFile *QTemporaryFile::createNativeFile(QFile &file)
qint64 old_off = 0;
if(wasOpen)
old_off = file.pos();
- else
- file.open(QIODevice::ReadOnly);
+ else if (!file.open(QIODevice::ReadOnly))
+ return nullptr;
//dump data
QTemporaryFile *ret = new QTemporaryFile;
if (ret->open()) {