Changeset f0097d1bf3 in tspsg


Ignore:
Timestamp:
Nov 14, 2014, 5:21:58 PM (9 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

Location:
src
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/mainwindow.cpp

    rfecf053b50 rf0097d1bf3  
    7979
    8080#ifdef Q_OS_WIN32
     81#   include <initguid.h>
    8182#   include "shobjidl.h"
    8283#endif
  • src/qtwin.cpp

    rfecf053b50 rf0097d1bf3  
    8484{
    8585    if (!pDwmIsCompositionEnabled) {
    86         QLibrary dwmLib(QString::fromAscii("dwmapi"));
     86        QLibrary dwmLib(QString::fromLatin1("dwmapi"));
    8787        pDwmIsCompositionEnabled =(PtrDwmIsCompositionEnabled)dwmLib.resolve("DwmIsCompositionEnabled");
    8888        pDwmExtendFrameIntoClientArea = (PtrDwmExtendFrameIntoClientArea)dwmLib.resolve("DwmExtendFrameIntoClientArea");
     
    197197#ifdef Q_OS_WIN32
    198198    if (resolveLibs()) {
    199         QLibrary dwmLib(QString::fromAscii("dwmapi"));
     199        QLibrary dwmLib(QString::fromLatin1("dwmapi"));
    200200        HRESULT hr = S_OK;
    201201        MARGINS m = {left, top, right, bottom};
     
    224224        DWORD color = 0;
    225225        BOOL opaque = FALSE;
    226         QLibrary dwmLib(QString::fromAscii("dwmapi"));
     226        QLibrary dwmLib(QString::fromLatin1("dwmapi"));
    227227        HRESULT hr = S_OK;
    228228        hr = pDwmGetColorizationColor(&color, &opaque);
Note: See TracChangeset for help on using the changeset viewer.