aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlaccessors_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-08-20 13:38:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-22 04:24:00 +0200
commite04cadca4a6c0b43d29c83d23ac74393694a5ea5 (patch)
treeaa495250e8fa420b6b262c76b1d5ad2050067cb9 /src/qml/qml/qqmlaccessors_p.h
parentff959399c9bd13e4c881cd6aa7f953dce92bda5b (diff)
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 <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlaccessors_p.h')
-rw-r--r--src/qml/qml/qqmlaccessors_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlaccessors_p.h b/src/qml/qml/qqmlaccessors_p.h
index 6df624eaf1..1a4aae0ef7 100644
--- a/src/qml/qml/qqmlaccessors_p.h
+++ b/src/qml/qml/qqmlaccessors_p.h
@@ -94,7 +94,7 @@ class QQmlNotifier;
} while (false);
#define QML_PRIVATE_ACCESSOR(clazz, cpptype, name, variable) \
- static void clazz ## _ ## name ## Read(QObject *o, intptr_t, void *rv) \
+ static void clazz ## _ ## name ## Read(QObject *o, qintptr, void *rv) \
{ \
clazz ## Private *d = clazz ## Private::get(static_cast<clazz *>(o)); \
*static_cast<cpptype *>(rv) = d->variable; \
@@ -105,15 +105,15 @@ class QQmlNotifier;
class QQmlAccessors
{
public:
- void (*read)(QObject *object, intptr_t property, void *output);
- void (*notifier)(QObject *object, intptr_t property, QQmlNotifier **notifier);
+ void (*read)(QObject *object, qintptr property, void *output);
+ void (*notifier)(QObject *object, qintptr property, QQmlNotifier **notifier);
};
namespace QQmlAccessorProperties {
struct Property {
const char *name;
unsigned int nameLength;
- intptr_t data;
+ qintptr data;
QQmlAccessors *accessors;
};