diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 21:21:09 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 21:21:09 +1000 |
| commit | fe0a4972b89d082b6f5557653a916b827dd6f865 (patch) | |
| tree | 8106788ced9e8baf8b021f5eaacb644c7b30795f /src | |
| parent | 77cd5455b200bf5a7d9fbc355f0fa7174630323f (diff) | |
| parent | 4ec4d78711ca08d0dc948bf669a203603a4aaa6d (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fixed compile of qdrawhelper_neon.cpp.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qdrawhelper_neon.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qdrawhelper_neon.cpp b/src/gui/painting/qdrawhelper_neon.cpp index e673dd9861..a098e82e19 100644 --- a/src/gui/painting/qdrawhelper_neon.cpp +++ b/src/gui/painting/qdrawhelper_neon.cpp @@ -986,7 +986,7 @@ public: static inline Int32x4 v_toInt(Float32x4 x) { return vcvtq_s32_f32(x); } - static inline Int32x4 v_greaterOrEqual(Float32x4 a, Float32x4 b) { return vcge_f32(a, b); } + static inline Int32x4 v_greaterOrEqual(Float32x4 a, Float32x4 b) { return vreinterpretq_s32_u32(vcgeq_f32(a, b)); } }; const uint * QT_FASTCALL qt_fetch_radial_gradient_neon(uint *buffer, const Operator *op, const QSpanData *data, |