diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-12 18:41:35 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-08-09 05:19:23 +0000 |
commit | 9312ec54dbf8031f4d23c6fc400c1ca27e3f9d1f (patch) | |
tree | 09e4443fd5b5762ab1499404d9598c13fe7fc465 /src/corelib/io/qabstractfileengine.cpp | |
parent | 284fff12172095a899303d9b4fc06c7bf502c93d (diff) |
Fix QAbstractFileEngine::clone misuse
QFile::copy was assuming that the target file was native and therefore
it could simply take the file descriptor to clone. While that was not
currently a problem, in theory it could be as we do have one writeable
file engine besides QFSFileEngine (QWinRTFileEngine).
By refactoring to take the parameter as a QAbstractFileEngine, we can
ensure that the target file is a native file.
Change-Id: Ib7a1737987bf4c4a8c51fffd14d0c048fd509025
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/io/qabstractfileengine.cpp')
-rw-r--r-- | src/corelib/io/qabstractfileengine.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp index 1163234b62..f2a895bbb8 100644 --- a/src/corelib/io/qabstractfileengine.cpp +++ b/src/corelib/io/qabstractfileengine.cpp @@ -864,13 +864,14 @@ bool QAbstractFileEngine::unmap(uchar *address) /*! \since 5.10 - Copies the contents from the file specified by \a sourceHandle to this file - by cloning it. + Duplicates the contents of this file (starting from the current position) + to the file specified by the engine \a target. + Returns \c true on success; otherwise, \c false is returned. */ -bool QAbstractFileEngine::clone(int sourceHandle) +bool QAbstractFileEngine::cloneTo(QAbstractFileEngine *target) { - Q_UNUSED(sourceHandle); + Q_UNUSED(target); return false; } |