From 397c3bb494e220af5ef1cf6e47cfdfc84b61540b Mon Sep 17 00:00:00 2001
From: jasplin <qt-info@nokia.com>
Date: Thu, 4 Jun 2009 10:39:29 +0200
Subject: Fixed build error with Sun CC 5.5.

Reviewed-by: TrustMe
---
 src/corelib/tools/qvector.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 7bdcba0..38254cd 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -94,7 +94,14 @@ template <typename T>
 class QVector
 {
     typedef QVectorTypedData<T> Data;
-    union { QVectorData *d; Data *p; };
+    union {
+        QVectorData *d;
+#if defined(Q_CC_SUN) && (__SUNPRO_CC <= 0x550)
+        QVectorTypedData<T> *p;
+#else
+        Data *p;
+#endif
+    };
 
 public:
     inline QVector() : d(&QVectorData::shared_null) { d->ref.ref(); }
-- 
cgit v0.12