diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-05-06 07:19:40 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-05-06 07:19:40 (GMT) |
| commit | faf8ee9f32df224a14d864887ab53e8a832400f4 (patch) | |
| tree | ff6cecf9fe45b43b2f35fee138b2f786ffa27d4e /src/corelib/kernel | |
| parent | b246f8a8beab858468777f433f49faf62edcb07e (diff) | |
| download | Qt-faf8ee9f32df224a14d864887ab53e8a832400f4.zip Qt-faf8ee9f32df224a14d864887ab53e8a832400f4.tar.gz Qt-faf8ee9f32df224a14d864887ab53e8a832400f4.tar.bz2 | |
Revert "Work around compiler bug on Nokia Metrowerks compiler."
This reverts commit 493f3e7691614dc12aaae75915ee7e988937e393.
The workaround is not needed anymore with Nokia X86 compiler
budled with Carbide C++ v2.x
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 870aba2..d7b7e3c 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -571,12 +571,7 @@ template<typename T> T qvariant_cast(const QVariant &v) if (qvariant_cast_helper(v, QVariant::Type(vid), &t)) return t; } -#ifdef Q_CC_NOKIAX86 - T t; - return t; -#else return T(); -#endif } template<typename T> |