diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-11-08 10:47:09 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-08 13:49:53 +0100 |
commit | 7317f4440a9af01feac7758afff8f98e9150dd62 (patch) | |
tree | a2b6101c2b9996e753dd1b8d489607958b9e5284 /src/winextras/qwinfunctions.cpp | |
parent | b6ca71cfb9889a784d3d9ee998974e89faf60bec (diff) |
Prefix the various CLSID/IID symbols by 'q'.
Avoid clashes with the various MinGW libraries.
Task-number: QTBUG-34638
Change-Id: I1fe0e1b79b52f887522c1c19a15bbdcb256fd917
Reviewed-by: Ivan Vizir <define-true-false@yandex.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/winextras/qwinfunctions.cpp')
-rw-r--r-- | src/winextras/qwinfunctions.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp index 8c6db87..3e62aff 100644 --- a/src/winextras/qwinfunctions.cpp +++ b/src/winextras/qwinfunctions.cpp @@ -43,6 +43,7 @@ #include "qwinfunctions.h" #include "qwinfunctions_p.h" #include "qwineventfilter_p.h" +#include "windowsguidsdefs_p.h" #include <QGuiApplication> #include <QWindow> @@ -1833,7 +1834,7 @@ void QtWin::setCurrentProcessExplicitAppUserModelID(const QString &id) ITaskbarList3 *qt_createITaskbarList3() { ITaskbarList3 *pTbList = 0; - HRESULT result = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, IID_ITaskbarList3, reinterpret_cast<void **>(&pTbList)); + HRESULT result = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, qIID_ITaskbarList3, reinterpret_cast<void **>(&pTbList)); if (SUCCEEDED(result)) { if (FAILED(pTbList->HrInit())) { pTbList->Release(); @@ -1849,7 +1850,7 @@ ITaskbarList3 *qt_createITaskbarList3() ITaskbarList2 *qt_createITaskbarList2() { ITaskbarList3 *pTbList = 0; - HRESULT result = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, IID_ITaskbarList2, reinterpret_cast<void **>(&pTbList)); + HRESULT result = CoCreateInstance(CLSID_TaskbarList, 0, CLSCTX_INPROC_SERVER, qIID_ITaskbarList2, reinterpret_cast<void **>(&pTbList)); if (SUCCEEDED(result)) { if (FAILED(pTbList->HrInit())) { pTbList->Release(); |