Changeset a7998257bc in tspsg for src

Timestamp:

Nov 12, 2014, 3:34:43 PM (10 years ago)

Author:

paulcdejean <paulcdejean@…>

Branches:

appveyor, imgbot, master

Children:

978fdf3c4b, f0097d1bf3

Parents:

fecf053b50

git-author:

paulcdejean <paulcdejean@…> (11/12/14 15:34:43)

git-committer:

paulcdejean <paulcdejean@…> (11/12/14 15:47:07)

Message:

Changes I had to make to get this to build on windows.

Location:

src

Files:

• 3rdparty/qttoolbardialog-2.2_1-opensource/config.pri (added)
• mainwindow.cpp (modified) (1 diff)
• qtwin.cpp (modified) (3 diffs)

src/mainwindow.cpp

@@ -79 +79 @@
 
 #ifdef Q_OS_WIN32
+#   include <initguid.h>
 #   include "shobjidl.h"
 #endif

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);