Merge pull request #1 from paulcdejean/master

Fix for building TSPSG with Qt 5 on Windows
leppa · Nov 14, 2014 · f0097d1 · f0097d1
2 parents fecf053 + a799825
commit f0097d1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/3rdparty/qttoolbardialog-2.2_1-opensource/config.pri b/src/3rdparty/qttoolbardialog-2.2_1-opensource/config.pri
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -78,6 +78,7 @@
 #endif
 
 #ifdef Q_OS_WIN32
+#   include <initguid.h>
 #   include "shobjidl.h"
 #endif
 

diff --git a/src/qtwin.cpp b/src/qtwin.cpp
@@ -83,7 +83,7 @@ class WindowNotifier : public QWidget
 static bool resolveLibs()
 {
     if (!pDwmIsCompositionEnabled) {
-        QLibrary dwmLib(QString::fromAscii("dwmapi"));
+        QLibrary dwmLib(QString::fromLatin1("dwmapi"));
         pDwmIsCompositionEnabled =(PtrDwmIsCompositionEnabled)dwmLib.resolve("DwmIsCompositionEnabled");
         pDwmExtendFrameIntoClientArea = (PtrDwmExtendFrameIntoClientArea)dwmLib.resolve("DwmExtendFrameIntoClientArea");
         pDwmEnableBlurBehindWindow = (PtrDwmEnableBlurBehindWindow)dwmLib.resolve("DwmEnableBlurBehindWindow");
@@ -196,7 +196,7 @@ bool QtWin::extendFrameIntoClientArea(QWidget *widget, int left, int top, int ri
     bool result = false;
 #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};
         hr = pDwmExtendFrameIntoClientArea(HWND(widget->winId()), &m);
@@ -223,7 +223,7 @@ QColor QtWin::colorizatinColor()
     if (resolveLibs()) {
         DWORD color = 0;
         BOOL opaque = FALSE;
-        QLibrary dwmLib(QString::fromAscii("dwmapi"));
+        QLibrary dwmLib(QString::fromLatin1("dwmapi"));
         HRESULT hr = S_OK;
         hr = pDwmGetColorizationColor(&color, &opaque);
         if (SUCCEEDED(hr))