diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-10-17 23:47:20 +1100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 21:21:09 +0200 |
| commit | 12d25f1a42d03c2d126d0fcf60622aa9b7dac6db (patch) | |
| tree | 3d0006f1a67a267c165a7a483a45b4c4dfb4749a /src/plugins | |
| parent | 4b7dd71aa05570dbf4e7819555c831bd6a79c2d5 (diff) | |
Fix compilation with MinGW-w64
Change-Id: I0c9e6adc54ccce34e0f81af048f2a51a4ac051b4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/windows/qtwindows_additional.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowstheme.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/windows/qtwindows_additional.h b/src/plugins/platforms/windows/qtwindows_additional.h index 3566367e41..a35a513579 100644 --- a/src/plugins/platforms/windows/qtwindows_additional.h +++ b/src/plugins/platforms/windows/qtwindows_additional.h @@ -83,7 +83,7 @@ #define CHILDID_SELF 0 #define WM_GETOBJECT 0x003D -#ifndef SIID_SHIELD // Shell structures for icons. +#ifndef SHGFI_ADDOVERLAYS // Shell structures for icons. typedef struct _SHSTOCKICONINFO { DWORD cbSize; diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp index 748ba09a90..d9de911914 100644 --- a/src/plugins/platforms/windows/qwindowstheme.cpp +++ b/src/plugins/platforms/windows/qwindowstheme.cpp @@ -587,7 +587,7 @@ public: T operator * () const { - return reinterpret_cast<T>(this); + return T(qintptr(this)); } void operator delete (void *) {} diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index fc3566660a..99b8922768 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -708,8 +708,8 @@ QWindowsWindow::QWindowsWindow(QWindow *aWindow, const WindowData &data) : #ifdef Q_OS_WINCE m_previouslyHidden(false), #endif - m_iconBig(0), - m_iconSmall(0) + m_iconSmall(0), + m_iconBig(0) { if (aWindow->surfaceType() == QWindow::OpenGLSurface) setFlag(OpenGLSurface); |