summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@digia.com>2013-09-30 08:20:24 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-02 19:37:55 +0200
commit3649a6e61d823289d18be19387d7e3923dd90bd0 (patch)
treed98777009a6225a9e40bfa6a04f974a5a6814d3d
parent19088c831a6d9ecc46ffd4487ff68df236096f05 (diff)
Fix QT_POINTER_SIZE on WinRT x64
Q_OS_WIN64 is not defined for WinRT, so make sure the pointer size is correct. Change-Id: I5a55bfd7edbfd23e0eab50fa31a76faa9e383a8d Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
-rw-r--r--src/corelib/global/qglobal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 1ebe0bd8ea..fd5ab865f3 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -192,7 +192,7 @@ typedef qint64 qlonglong;
typedef quint64 qulonglong;
#ifndef QT_POINTER_SIZE
-# if defined(Q_OS_WIN64)
+# if defined(Q_OS_WIN64) || (defined(Q_OS_WINRT) && defined(_M_X64))
# define QT_POINTER_SIZE 8
# elif defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined(Q_OS_WINRT)
# define QT_POINTER_SIZE 4