diff options
| author | Jani Uusi-Rantala <jani.uusi-rantala@nokia.com> | 2011-11-01 21:30:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-01 20:42:28 +0100 |
| commit | afafc1d9cc8e6d3fc5da29251cdf5d3bb6404a1b (patch) | |
| tree | 7f5f98c451202270215a5622fde67d7218fd36a5 /src/declarative/qml/qdeclarativeengine.cpp | |
| parent | edfeaf5df3737846c328042ff5670d27ef78426d (diff) | |
Fix most of the declarative bindings failing on ARM.
There was a mismatch between 32 and 64-bit integers which
caused a lot of qdeclarative unit tests to fail and QML to
generally not work properly on ARM.
All of the failing auto tests pass now on ARMV7.
Change-Id: Icf230f79e56c15743c6ee943859ac02e649a6e0a
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 50b5db897c..86c944f65e 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -1114,7 +1114,7 @@ void QDeclarativeData::addNotify(int index, QDeclarativeNotifierEndpoint *endpoi Q_ASSERT(!endpoint->isConnected()); index = qMin(index, 0xFFFF - 1); - notifyList->connectionMask |= (1 << (quint64(index) % 64)); + notifyList->connectionMask |= (1ULL << quint64(index % 64)); if (index < notifyList->notifiesSize) { |