Fix compilation with MinGW-w64
Change-Id: I0c9e6adc54ccce34e0f81af048f2a51a4ac051b4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
parent
4b7dd71aa0
commit
12d25f1a42
@ -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;
|
||||
|
@ -587,7 +587,7 @@ public:
|
||||
|
||||
T operator * () const
|
||||
{
|
||||
return reinterpret_cast<T>(this);
|
||||
return T(qintptr(this));
|
||||
}
|
||||
|
||||
void operator delete (void *) {}
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user