diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2024-04-26 09:43:02 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2024-04-26 10:59:07 +0200 |
| commit | dea0da7a8bb59be2e8fef698e07d20592ed24a3e (patch) | |
| tree | 684af4e450ab025b2e433d4b381b1b8550f98abd /src/libs | |
| parent | 5c765e7c125ceba1d13d54ae0a452ff22d151c8e (diff) | |
| parent | 6b7c6bde5afd87c9152fbe65e041b262c609538f (diff) | |
Merge remote-tracking branch 'origin/13.0'
Conflicts:
src/plugins/languageclient/languageclientutils.cpp
Change-Id: I8d1945f79d93cecee9b22f409bc5f2eefaf6a4cd
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/utils/fileutils.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index a2998e2f07..b3649a457d 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -197,7 +197,8 @@ FileSaver::FileSaver(const FilePath &filePath, QIODevice::OpenMode mode) m_file.reset(tf); } else { const bool readOnlyOrAppend = mode & (QIODevice::ReadOnly | QIODevice::Append); - m_isSafe = !readOnlyOrAppend && !filePath.hasHardLinks(); + m_isSafe = !readOnlyOrAppend && !filePath.hasHardLinks() + && !qtcEnvironmentVariableIsSet("QTC_DISABLE_ATOMICSAVE"); if (m_isSafe) m_file.reset(new SaveFile(filePath)); else |