diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2012-10-17 12:34:32 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-30 09:11:16 (GMT) |
| commit | 292bfacd4f4420ba47b6aa0bd1d0686e02711845 (patch) | |
| tree | f8738913d412bc08c87be701857b5177992a2a47 /src/gui/painting | |
| parent | b997b885f468bb2ef20a70133bc194a27fa27a8e (diff) | |
| download | Qt-292bfacd4f4420ba47b6aa0bd1d0686e02711845.zip Qt-292bfacd4f4420ba47b6aa0bd1d0686e02711845.tar.gz Qt-292bfacd4f4420ba47b6aa0bd1d0686e02711845.tar.bz2 | |
Fixed GCC 3.4 build with sse2 enabled.
With minimal effort we can keep the GCC 3.4 build working.
Task-number: QTBUG-19803
Change-Id: I31611a27b97d5ac426ea857d8f1b656dc6f5377a
(cherry picked from commit 7d7f09650c3b3b2990f16ff4a6401a8c74e1f868)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qdrawhelper_sse2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp index 740b1ab..bf373d6 100644 --- a/src/gui/painting/qdrawhelper_sse2.cpp +++ b/src/gui/painting/qdrawhelper_sse2.cpp @@ -520,7 +520,8 @@ public: static inline Int32x4 v_toInt(Float32x4 x) { return _mm_cvttps_epi32(x); } // pre-VS 2008 doesn't have cast intrinsics, whereas 2008 and later requires it -#if defined(Q_CC_MSVC) && _MSC_VER < 1500 + // (same deal with gcc prior to 4.0) +#if (defined(Q_CC_MSVC) && _MSC_VER < 1500) || (defined(Q_CC_GNU) && __GNUC__ < 4) static inline Int32x4 v_greaterOrEqual(Float32x4 a, Float32x4 b) { union Convert { Int32x4 vi; Float32x4 vf; } convert; |