From faf8ee9f32df224a14d864887ab53e8a832400f4 Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Wed, 6 May 2009 10:19:40 +0300
Subject: 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
---
 src/corelib/kernel/qvariant.h | 5 -----
 1 file changed, 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>
-- 
cgit v0.12