diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-02 09:32:37 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-01-02 09:32:37 +0000 |
| commit | 9de26a630fd49014b40e7322c971f3d96fc986af (patch) | |
| tree | 47b9a762d7b6cfd99f37ff46dda87904da9f067b /src/corelib/io/qfile.cpp | |
| parent | bb6f0a5291f8a51d7dc21f13463dd2a0b27ed916 (diff) | |
| parent | 0f315adf9199efcfafa44371464ab6d1fc866774 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/io/qfile.cpp')
| -rw-r--r-- | src/corelib/io/qfile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index bac995ff25..e4888e9523 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -503,7 +503,8 @@ bool QFile::remove() { Q_D(QFile); - if (d->fileName.isEmpty()) { + if (d->fileName.isEmpty() && + !static_cast<QFSFileEngine *>(d->engine())->isUnnamedFile()) { qWarning("QFile::remove: Empty or null file name"); return false; } |