diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-31 10:30:44 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-31 10:30:44 +0200 |
| commit | 241ccb7c8363723c7eadf54ebe025bd739d2789f (patch) | |
| tree | 20c4baa36ac95cdb1a2796c7753611df6b29f9f7 /src | |
| parent | 305f2c3aa6a2405f8fdeaa33f5d8c684e425f4ee (diff) | |
| parent | 652085c5c2f843b1345e741352b4e2e8328f13fe (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ifbaa4877051d93bcb0d58eed35bfe8dffa5634a3
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qfsfileengine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h index 5231b4fe6f..22109ac5bc 100644 --- a/src/corelib/io/qfsfileengine_p.h +++ b/src/corelib/io/qfsfileengine_p.h @@ -66,7 +66,7 @@ struct ProcessOpenModeResult { QIODevice::OpenMode openMode; QString error; }; -inline Q_CORE_EXPORT ProcessOpenModeResult processOpenModeFlags(QIODevice::OpenMode mode); +Q_CORE_EXPORT ProcessOpenModeResult processOpenModeFlags(QIODevice::OpenMode mode); class QFSFileEnginePrivate; |