From b03cabc4cdcc1e416dbb3c59eeb00cc1488ec21f Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Tue, 7 Feb 2012 23:12:36 +1100
Subject: Change WId to be a quintptr.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix compilation with MinGW-w64: Use quintptr instead of
unsigned long as WId needs to be able to cast to
HWND which is a 64-bit pointer on Windows 64-bit.

Acked-by: Samuel Rødal <samuel.rodal@nokia.com>

Change-Id: I7bbe83ce02b739eb04218ca4b6b478509347d515
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/gui/kernel/qwindowdefs.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h
index 82cce0394b..c2d7a2fe2f 100644
--- a/src/gui/kernel/qwindowdefs.h
+++ b/src/gui/kernel/qwindowdefs.h
@@ -42,6 +42,7 @@
 #ifndef QWINDOWDEFS_H
 #define QWINDOWDEFS_H
 
+#include <QtCore/qglobal.h>
 #include <QtCore/qobjectdefs.h>
 #include <QtCore/qnamespace.h>
 
@@ -99,7 +100,7 @@ QT_END_HEADER
 
 
 
-typedef unsigned long  WId;
+typedef QT_PREPEND_NAMESPACE(quintptr) WId;
 
 
 
-- 
cgit v1.2.3