diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-11 08:14:39 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-11 08:14:39 (GMT) |
| commit | b5d9d2eb1fbfbbf2732e90ef4d6a3e3ae5104c0c (patch) | |
| tree | e224a95589b45d268c79ee55911f9eb85a9eb1b6 /src/gui/painting/qdrawhelper.cpp | |
| parent | a21ac7e75730bb094b49e5b58698a2ceebe8d73e (diff) | |
| parent | c75bd51df44359c386149c6962532344123b07d5 (diff) | |
| download | Qt-b5d9d2eb1fbfbbf2732e90ef4d6a3e3ae5104c0c.zip Qt-b5d9d2eb1fbfbbf2732e90ef4d6a3e3ae5104c0c.tar.gz Qt-b5d9d2eb1fbfbbf2732e90ef4d6a3e3ae5104c0c.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/painting/qdrawhelper.cpp')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 5f70cb7..581b538 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -7820,7 +7820,6 @@ void qInitDrawhelperAsm() CompositionFunction *functionForModeAsm = 0; CompositionFunctionSolid *functionForModeSolidAsm = 0; -#ifdef QT_NO_DEBUG const uint features = qDetectCPUFeatures(); if (false) { #ifdef QT_HAVE_SSE2 @@ -7944,8 +7943,6 @@ void qInitDrawhelperAsm() } #endif // IWMMXT -#endif // QT_NO_DEBUG - #if defined(Q_CC_RVCT) && defined(QT_HAVE_ARMV6) functionForModeAsm = qt_functionForMode_ARMv6; functionForModeSolidAsm = qt_functionForModeSolid_ARMv6; |