diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-28 10:03:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-28 10:03:04 (GMT) |
| commit | 1dca379031381eb7bff91970aec8056f1b7f2efb (patch) | |
| tree | 2851ca55958fd0bb0f67d3f21be207c236e88aab | |
| parent | 39a2b4cb71423db004ea5e6380c9c73bb35d5a2d (diff) | |
| parent | 556722030728c8ae7f091ede80fb9ceeeab5479a (diff) | |
| download | Qt-1dca379031381eb7bff91970aec8056f1b7f2efb.zip Qt-1dca379031381eb7bff91970aec8056f1b7f2efb.tar.gz Qt-1dca379031381eb7bff91970aec8056f1b7f2efb.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't use SSE2 if the emmintrin.h header wasn't found.
| -rw-r--r-- | src/corelib/tools/qsimd_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 369fab7..44c1798 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -61,7 +61,7 @@ QT_MODULE(Core) #endif // SSE intrinsics -#if defined(__SSE2__) && !defined(QT_BOOTSTRAPPED) +#if defined(__SSE2__) && defined(QT_HAVE_SSE2) && !defined(QT_BOOTSTRAPPED) #if defined(QT_LINUXBASE) /// this is an evil hack - the posix_memalign declaration in LSB /// is wrong - see http://bugs.linuxbase.org/show_bug.cgi?id=2431 |