From 13c5fcb72cbe96f78be9b7cdbadff6012e7b66a3 Mon Sep 17 00:00:00 2001
From: Kent Hansen <khansen@trolltech.com>
Date: Wed, 19 Aug 2009 11:55:39 +0200
Subject: build on Solaris

Work-around for "Error: A union member cannot have a user-defined
assignment operator."
---
 src/3rdparty/webkit/JavaScriptCore/runtime/CallData.h      | 7 ++++++-
 src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.h | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.h b/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.h
index f7117be..b77ea05 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/CallData.h
@@ -65,7 +65,12 @@ namespace JSC {
     };
 #endif
 
-    union CallData {
+#if defined(QT_BUILD_SCRIPT_LIB) && defined(Q_OS_SOLARIS)
+    struct
+#else
+    union
+#endif
+    CallData {
         struct {
 #ifndef QT_BUILD_SCRIPT_LIB
             NativeFunction function;
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.h b/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.h
index af720bb..7418974 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/ConstructData.h
@@ -70,7 +70,12 @@ namespace JSC {
     };
 #endif
 
-    union ConstructData {
+#if defined(QT_BUILD_SCRIPT_LIB) && defined(Q_OS_SOLARIS)
+    struct
+#else
+    union
+#endif
+    ConstructData {
         struct {
 #ifndef QT_BUILD_SCRIPT_LIB
             NativeConstructor function;
-- 
cgit v0.12