diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 09:09:01 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 10:31:21 +0100 |
| commit | 4783de0473a288fdff7e5354c12315ba025ec7e0 (patch) | |
| tree | 1dbd12129b4677c5a02307c1046fdb8cff056324 /src/corelib/io/qfile_p.h | |
| parent | 60054b5940b19f4dd9780e63da1e2dce45baf131 (diff) | |
| parent | 38c1057f696c4e3f168305091413428d99007c43 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/network/socket/qnativesocketengine_winrt.cpp
tools/configure/configureapp.cpp
tools/configure/environment.cpp
Change-Id: Ieae6f2ee004a87f041751852b687484f91ee4480
Diffstat (limited to 'src/corelib/io/qfile_p.h')
| -rw-r--r-- | src/corelib/io/qfile_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfile_p.h b/src/corelib/io/qfile_p.h index fd7db3c120..545890c6b3 100644 --- a/src/corelib/io/qfile_p.h +++ b/src/corelib/io/qfile_p.h @@ -70,7 +70,7 @@ protected: bool openExternalFile(int flags, int fd, QFile::FileHandleFlags handleFlags); bool openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handleFlags); - virtual QAbstractFileEngine *engine() const; + QAbstractFileEngine *engine() const override; QString fileName; }; |