From b0f86a38ca34c2eadd233befa848fbcf22f66a53 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 3 Jul 2018 19:31:49 +0200 Subject: [PATCH] Replace fromAscii() with fromLatin1() --- 3rdparty/qtwin/qtwin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdparty/qtwin/qtwin.cpp b/3rdparty/qtwin/qtwin.cpp index 69a24a9d..f393cd64 100644 --- a/3rdparty/qtwin/qtwin.cpp +++ b/3rdparty/qtwin/qtwin.cpp @@ -71,7 +71,7 @@ private: static bool resolveLibs() { if (!pDwmIsCompositionEnabled) { - QLibrary dwmLib(QString::fromAscii("dwmapi")); + QLibrary dwmLib(QString::toLatin1("dwmapi")); pDwmIsCompositionEnabled =(PtrDwmIsCompositionEnabled)dwmLib.resolve("DwmIsCompositionEnabled"); pDwmExtendFrameIntoClientArea = (PtrDwmExtendFrameIntoClientArea)dwmLib.resolve("DwmExtendFrameIntoClientArea"); pDwmEnableBlurBehindWindow = (PtrDwmEnableBlurBehindWindow)dwmLib.resolve("DwmEnableBlurBehindWindow"); @@ -165,7 +165,7 @@ bool QtWin::extendFrameIntoClientArea(QWidget *widget, int left, int top, int ri bool result = false; #ifdef Q_WS_WIN if (resolveLibs()) { - QLibrary dwmLib(QString::fromAscii("dwmapi")); + QLibrary dwmLib(QString::toLatin1("dwmapi")); HRESULT hr = S_OK; MARGINS m = {left, top, right, bottom}; hr = pDwmExtendFrameIntoClientArea(widget->winId(), &m); @@ -192,7 +192,7 @@ QColor QtWin::colorizatinColor() if (resolveLibs()) { DWORD color = 0; BOOL opaque = FALSE; - QLibrary dwmLib(QString::fromAscii("dwmapi")); + QLibrary dwmLib(QString::toLatin1("dwmapi")); HRESULT hr = S_OK; hr = pDwmGetColorizationColor(&color, &opaque); if (SUCCEEDED(hr))