summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2012-02-07 23:12:36 +1100
committerQt by Nokia <qt-info@nokia.com>2012-02-07 20:03:50 +0100
commitb03cabc4cdcc1e416dbb3c59eeb00cc1488ec21f (patch)
treee9c84064f7e53cc8629d7e751c88ae13ae50a455 /src
parentde7e3a7db734bcfee3fbe6a444ed0a9e56c5bee5 (diff)
Change WId to be a quintptr.
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>
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qwindowdefs.h3
1 files changed, 2 insertions, 1 deletions
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;