diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-14 20:07:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-14 20:07:36 (GMT) |
| commit | d39f3980f5ba449a43d25d46a3c0eee81001856a (patch) | |
| tree | bd58b28e5f9f088b5a2e8b755f8787aa78a292e3 /src/corelib | |
| parent | cfee61fd74d7fe73f0de13356fe683bc8ae91f92 (diff) | |
| parent | 2d0bd1a13328d5a5ed6c4d1e768937a6627f1086 (diff) | |
| download | Qt-d39f3980f5ba449a43d25d46a3c0eee81001856a.zip Qt-d39f3980f5ba449a43d25d46a3c0eee81001856a.tar.gz Qt-d39f3980f5ba449a43d25d46a3c0eee81001856a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QFile::remove: don't fail for unrelated errors
Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent for review into 4.6.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa )
network internals: fix uploading of data
File dialog mode is not correctly updated in Mac (Cocoa).
add tests for QFlags behavior in QtScript
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qfile.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 6395cc7..4c7f3f0 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -643,6 +643,7 @@ QFile::remove() qWarning("QFile::remove: Empty or null file name"); return false; } + unsetError(); close(); if(error() == QFile::NoError) { if(fileEngine()->remove()) { |