Changeset 978fdf3c4b in tspsg

Timestamp:

Nov 12, 2014, 3:48:44 PM (9 years ago)

Author:

Paul Dejean <paulcdejean@…>

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 a7998257bc24e3ef270d76ff80f3bd89abe74d1b into fecf053b50fe171d5753897f0f26f109a2e18eae

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