From e04cadca4a6c0b43d29c83d23ac74393694a5ea5 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 20 Aug 2013 13:38:15 +0200 Subject: Fix compilation with MSVC 2008 (and prospective Windows CE build fix) * Only 2010 and newer ship stdint.h, so for 2008 we have to provide a little stdint.h compat header, for some of the third-party code we import. Our own Qt code this patch changes to use quint* types instead. * Include math.h and float.h for some math functions. * disable the JIT on Windows CE for now. * Change use of intptr_t to qintptr in Qt code. intptr_t is in inttypes.h, except that with VS 2008 it is indirectly available through stdio.h. Let's avoid the mess and just use the qt type, that's always available. Change-Id: I19055edd89e0a6b147d9edbb3b711798ed3c05a5 Reviewed-by: Lars Knoll --- src/qml/qml/qqmlpropertycache_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml/qqmlpropertycache_p.h') diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index daba6e856d..21fee28b02 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -205,7 +205,7 @@ public: }; struct { // When HasAccessors QQmlAccessors *accessors; - intptr_t accessorData; + qintptr accessorData; }; }; -- cgit v1.2.3