Changeset f0097d1bf3 in tspsg for src/qtwin.cpp

Timestamp:

Nov 14, 2014, 5:21:58 PM (10 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master

Children:

202ca90d03

Parents:

fecf053b50 (diff), a7998257bc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #1 from paulcdejean/master

Fix for building TSPSG with Qt 5 on Windows

File:

• src/qtwin.cpp (modified) (3 diffs)

src/qtwin.cpp

@@ -84 +84 @@
 {
     if (!pDwmIsCompositionEnabled) {
-        QLibrary dwmLib(QString::fromAscii("dwmapi"));
+        QLibrary dwmLib(QString::fromLatin1("dwmapi"));
         pDwmIsCompositionEnabled =(PtrDwmIsCompositionEnabled)dwmLib.resolve("DwmIsCompositionEnabled");
         pDwmExtendFrameIntoClientArea = (PtrDwmExtendFrameIntoClientArea)dwmLib.resolve("DwmExtendFrameIntoClientArea");
@@ -197 +197 @@
 #ifdef Q_OS_WIN32
     if (resolveLibs()) {
-        QLibrary dwmLib(QString::fromAscii("dwmapi"));
+        QLibrary dwmLib(QString::fromLatin1("dwmapi"));
         HRESULT hr = S_OK;
         MARGINS m = {left, top, right, bottom};
@@ -224 +224 @@
         DWORD color = 0;
         BOOL opaque = FALSE;
-        QLibrary dwmLib(QString::fromAscii("dwmapi"));
+        QLibrary dwmLib(QString::fromLatin1("dwmapi"));
         HRESULT hr = S_OK;
         hr = pDwmGetColorizationColor(&color, &opaque);