feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.7' into 4.8

Browse Source 
Change-Id: Ia215af4ddad73053582284d3ce8d56b92dbbc8f3
This commit is contained in:
Eike Ziller
2018-09-27 09:07:07 +02:00
parent 6f56feef29 8d609692b3
commit 6507db19e4
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dist/changes-4.7.1.md vendored
View File

@@ -25,9 +25,15 @@ C++ Support
* Clang Code Model * Clang Code Model
* Fixed include order for Clang headers * Fixed include order for Clang headers
QML Support
* Fixed that comments could break reformatting (QTCREATORBUG-21036)
Debugging Debugging
* Fixed remote debugging command line argument (QTCREATORBUG-20928) * Fixed remote debugging command line argument (QTCREATORBUG-20928)
* Fixed environment for `Start and Debug External Application`
(QTCREATORBUG-20185)
* GDB * GDB
* Fixed GDB built-in pretty printer handling (QTCREATORBUG-20770) * Fixed GDB built-in pretty printer handling (QTCREATORBUG-20770)
* CDB * CDB

27
src/libs/utils/savefile.cpp
View File

@@ -128,19 +128,32 @@ bool SaveFile::commit()
fileName().toStdWString().data(), fileName().toStdWString().data(),
nullptr, REPLACEFILE_IGNORE_MERGE_ERRORS, nullptr, nullptr); nullptr, REPLACEFILE_IGNORE_MERGE_ERRORS, nullptr, nullptr);
if (!result) { if (!result) {
const DWORD replaceErrorCode = GetLastError(); DWORD replaceErrorCode = GetLastError();
QString errorStr; QString errorStr;
if (!QFile::exists(finalFileName)) { if (!QFile::exists(finalFileName)) {
// Replace failed because finalFileName does not exist, try rename. // Replace failed because finalFileName does not exist, try rename.
if (!(result = rename(finalFileName))) if (!(result = rename(finalFileName)))
errorStr = errorString(); errorStr = errorString();
} else { } else {
wchar_t messageBuffer[256]; if (replaceErrorCode == ERROR_UNABLE_TO_REMOVE_REPLACED) {
FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, // If we do not get the rights to remove the original final file we still might try
nullptr, replaceErrorCode, // to replace the file contents
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), result = MoveFileEx(fileName().toStdWString().data(),
messageBuffer, sizeof(messageBuffer), nullptr); finalFileName.toStdWString().data(),
errorStr = QString::fromWCharArray(messageBuffer); MOVEFILE_COPY_ALLOWED
| MOVEFILE_REPLACE_EXISTING
| MOVEFILE_WRITE_THROUGH);
if (!result)
replaceErrorCode = GetLastError();
}
if (!result) {
wchar_t messageBuffer[256];
FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
nullptr, replaceErrorCode,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
messageBuffer, sizeof(messageBuffer), nullptr);
errorStr = QString::fromWCharArray(messageBuffer);
}
} }
if (!result) { if (!result) {
remove(); remove();