diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-12 07:31:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-12 08:33:08 +0200 |
| commit | 990969655c5fb4d03682e96df9b12101f5ee9815 (patch) | |
| tree | b8fb5c50285105c8bc5a938fb50f93ff9f24889d /src/gui/text/qzip.cpp | |
| parent | a213011a53f12f101d08a04afc8fdacd2d54a232 (diff) | |
| parent | e64b2234e829cc47872225debcf80d6c06db18f0 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
config_help.txt
configure
src/corelib/io/qprocess_wince.cpp
src/plugins/platforms/windows/qwindowstheme.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qtimezone/BLACKLIST
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01
Diffstat (limited to 'src/gui/text/qzip.cpp')
| -rw-r--r-- | src/gui/text/qzip.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp index 5178f5a9a8..7cb89543ba 100644 --- a/src/gui/text/qzip.cpp +++ b/src/gui/text/qzip.cpp @@ -822,12 +822,12 @@ void QZipWriterPrivate::addEntry(EntryType type, const QString &fileName, const QZipReader::QZipReader(const QString &archive, QIODevice::OpenMode mode) { QScopedPointer<QFile> f(new QFile(archive)); - f->open(mode); + const bool result = f->open(mode); QZipReader::Status status; const QFileDevice::FileError error = f->error(); - if (error == QFile::NoError) + if (result && error == QFile::NoError) { status = NoError; - else { + } else { if (error == QFile::ReadError) status = FileReadError; else if (error == QFile::OpenError) @@ -1119,9 +1119,8 @@ void QZipReader::close() QZipWriter::QZipWriter(const QString &fileName, QIODevice::OpenMode mode) { QScopedPointer<QFile> f(new QFile(fileName)); - f->open(mode); QZipWriter::Status status; - if (f->error() == QFile::NoError) + if (f->open(mode) && f->error() == QFile::NoError) status = QZipWriter::NoError; else { if (f->error() == QFile::WriteError) |