Changeset 978fdf3c4b in tspsg for src/qtwin.cpp


Ignore:
Timestamp:
Nov 12, 2014, 3:48:44 PM (10 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/qtwin.cpp

    rfecf053b50 r978fdf3c4b  
    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.