From 19d1f0fe8c2c67c67699f4ef86de2020a0e4aaa2 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 2 May 2016 17:56:00 +0300 Subject: [PATCH] Removed WinRT QFile::copy() fix from Qt patch: change approved to Qt. --- Telegram/Patches/qtbase_5_6_0.diff | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Telegram/Patches/qtbase_5_6_0.diff b/Telegram/Patches/qtbase_5_6_0.diff index f5383e1940..8b3ba042c2 100644 --- a/Telegram/Patches/qtbase_5_6_0.diff +++ b/Telegram/Patches/qtbase_5_6_0.diff @@ -16,23 +16,6 @@ index eec9e1f..ec3015e 100644 QMAKE_CFLAGS_YACC = QMAKE_CFLAGS_LTCG = -GL QMAKE_CFLAGS_SSE2 = -arch:SSE2 -diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp -index f1a6019..81ff6ef 100644 ---- a/src/corelib/io/qfilesystemengine_win.cpp -+++ b/src/corelib/io/qfilesystemengine_win.cpp -@@ -1416,8 +1416,10 @@ bool QFileSystemEngine::copyFile(const QFileSystemEntry &source, const QFileSyst - COPYFILE2_EXTENDED_PARAMETERS copyParams = { - sizeof(copyParams), COPY_FILE_FAIL_IF_EXISTS, NULL, NULL, NULL - }; -- bool ret = ::CopyFile2((const wchar_t*)source.nativeFilePath().utf16(), -- (const wchar_t*)target.nativeFilePath().utf16(), ©Params) != 0; -+ // CopyFile2 returns HRESULT, not BOOL, so it should be tested for S_OK, not 0. -+ HRESULT hres = ::CopyFile2((const wchar_t*)source.nativeFilePath().utf16(), -+ (const wchar_t*)target.nativeFilePath().utf16(), ©Params); -+ bool ret = SUCCEEDED(hres); - #endif // Q_OS_WINRT - if(!ret) - error = QSystemError(::GetLastError(), QSystemError::NativeError); diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/tools/qunicodetables.cpp index 14e4fd1..c31c62b 100644 --- a/src/corelib/tools/qunicodetables.cpp