diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-20 13:38:15 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-22 04:24:00 +0200 |
commit | e04cadca4a6c0b43d29c83d23ac74393694a5ea5 (patch) | |
tree | aa495250e8fa420b6b262c76b1d5ad2050067cb9 /src/qml/qml/qqmlnotifier.cpp | |
parent | ff959399c9bd13e4c881cd6aa7f953dce92bda5b (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/qqmlnotifier.cpp')
-rw-r--r-- | src/qml/qml/qqmlnotifier.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlnotifier.cpp b/src/qml/qml/qqmlnotifier.cpp index da016c90a5..3d4b260574 100644 --- a/src/qml/qml/qqmlnotifier.cpp +++ b/src/qml/qml/qqmlnotifier.cpp @@ -61,15 +61,15 @@ static Callback QQmlNotifier_callbacks[] = { void QQmlNotifier::emitNotify(QQmlNotifierEndpoint *endpoint, void **a) { - intptr_t originalSenderPtr; - intptr_t *disconnectWatch; + qintptr originalSenderPtr; + qintptr *disconnectWatch; if (!endpoint->isNotifying()) { originalSenderPtr = endpoint->senderPtr; disconnectWatch = &originalSenderPtr; - endpoint->senderPtr = intptr_t(disconnectWatch) | 0x1; + endpoint->senderPtr = qintptr(disconnectWatch) | 0x1; } else { - disconnectWatch = (intptr_t *)(endpoint->senderPtr & ~0x1); + disconnectWatch = (qintptr *)(endpoint->senderPtr & ~0x1); } if (endpoint->next) @@ -111,7 +111,7 @@ void QQmlNotifierEndpoint::connect(QObject *source, int sourceSignal, QQmlEngine qPrintable(engineName)); } - senderPtr = intptr_t(source); + senderPtr = qintptr(source); this->sourceSignal = sourceSignal; QQmlPropertyPrivate::flushSignal(source, sourceSignal); QQmlData *ddata = QQmlData::get(source, true); |