diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-08-06 12:24:37 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-08-07 12:50:28 +0200 |
| commit | 05b90be3c5ce4709156178478abb2e7ba125a0be (patch) | |
| tree | a7c39b76c99f4887dbc6837be3a41afc7fdb29b4 /src/widgets/dialogs/qfileinfogatherer_p.h | |
| parent | 7301e44161d8bb25410219a31405584c9492b83e (diff) | |
| parent | 6f357f50b4b72e3c5a6903a09624ade1d72d12c1 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'src/widgets/dialogs/qfileinfogatherer_p.h')
| -rw-r--r-- | src/widgets/dialogs/qfileinfogatherer_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qfileinfogatherer_p.h b/src/widgets/dialogs/qfileinfogatherer_p.h index 795f60249f..829c620c1e 100644 --- a/src/widgets/dialogs/qfileinfogatherer_p.h +++ b/src/widgets/dialogs/qfileinfogatherer_p.h @@ -210,13 +210,13 @@ private: QAtomicInt abort; #if QT_CONFIG(filesystemwatcher) - QFileSystemWatcher *watcher; -#endif -#ifdef Q_OS_WIN - bool m_resolveSymlinks; // not accessed by run() + QFileSystemWatcher *watcher = nullptr; #endif QFileIconProvider *m_iconProvider; // not accessed by run() QFileIconProvider defaultProvider; +#ifdef Q_OS_WIN + bool m_resolveSymlinks = true; // not accessed by run() +#endif }; QT_END_NAMESPACE |