diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 19:17:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 19:17:58 (GMT) |
| commit | 4ae323abfec7f703120c1c425ea78b367578d2b8 (patch) | |
| tree | 2278810091add0dc71edb41bfb2155ff5fd44661 | |
| parent | 55dadee60cb74cf758ad962654a066314979bfdc (diff) | |
| parent | d2d7aef223a3bad368c6b7c7f7f4617f4acf323c (diff) | |
| download | Qt-4ae323abfec7f703120c1c425ea78b367578d2b8.zip Qt-4ae323abfec7f703120c1c425ea78b367578d2b8.tar.gz Qt-4ae323abfec7f703120c1c425ea78b367578d2b8.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixed compile of qdrawhelper_neon.cpp.
| -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 e673dd9..a098e82 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, |