From 9fa5b516f49bb252d6c57d14d54151d8ee3bf9d1 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@qt.io> Date: Fri, 23 Sep 2016 12:34:42 +0200 Subject: [PATCH] Remove the usage of deprecated functions Because of 8a48d66da999d99dac4e9217542c5f954450ddb4 in qtbase, and we don't support Windows XP any more. Change-Id: Ic68e9ec1aaeb974959958aab1ae3c3a4814d561f Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> --- src/tools/idc/main.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/tools/idc/main.cpp b/src/tools/idc/main.cpp index 60ec1e42..43d814fa 100644 --- a/src/tools/idc/main.cpp +++ b/src/tools/idc/main.cpp @@ -176,9 +176,6 @@ static bool attachTypeLibrary(const QString &applicationName, int resource, cons static HMODULE loadLibraryQt(const QString &input) { - if (QSysInfo::windowsVersion() < QSysInfo::WV_VISTA) - return LoadLibrary(reinterpret_cast<const wchar_t *>(input.utf16())); // fallback for Windows XP and older - // Load DLL with the folder containing the DLL temporarily added to the search path when loading dependencies return LoadLibraryEx(reinterpret_cast<const wchar_t *>(input.utf16()), NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); -- GitLab