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/qqmlabstractbinding_p.h | |
| 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/qqmlabstractbinding_p.h')
| -rw-r--r-- | src/qml/qml/qqmlabstractbinding_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlabstractbinding_p.h b/src/qml/qml/qqmlabstractbinding_p.h index 7ac10a6d63..40d42d8284 100644 --- a/src/qml/qml/qqmlabstractbinding_p.h +++ b/src/qml/qml/qqmlabstractbinding_p.h @@ -171,7 +171,7 @@ private: // the vTables array are used for dispatching. // This saves a compiler-generated pointer to a compiler-generated vTable, and thus reduces // the binding object size by sizeof(void*). - uintptr_t m_nextBindingPtr; + qintptr m_nextBindingPtr; static VTable *vTables[]; inline const VTable *vtable() const { return vTables[bindingType()]; } @@ -200,7 +200,7 @@ QQmlAbstractBinding *QQmlAbstractBinding::nextBinding() const void QQmlAbstractBinding::setNextBinding(QQmlAbstractBinding *b) { - m_nextBindingPtr = uintptr_t(b) | (m_nextBindingPtr & 0x3); + m_nextBindingPtr = qintptr(b) | (m_nextBindingPtr & 0x3); } QQmlAbstractBinding::BindingType QQmlAbstractBinding::bindingType() const |