Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2

3 files changed, 28 insertions, 27 deletions

diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index af3fc93..d608038 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -305,17 +305,17 @@
 
     \hr
 
-    Copyright (c) 1987, 1993, 1994
+    Copyright (c) 1987, 1993, 1994\br
     The Regents of the University of California.  All rights reserved.
     
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
-    are met:
+    are met:\br
     1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
+       notice, this list of conditions and the following disclaimer.\br
     2. Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
+       documentation and/or other materials provided with the distribution.\br
     3. Neither the name of the University nor the names of its contributors
        may be used to endorse or promote products derived from this software
        without specific prior written permission.
@@ -334,22 +334,22 @@
 
     \hr
 
-    Copyright (C) 1988-1997 Sam Leffler
-    Copyright (C) 1991-1997 Silicon Graphics, Inc.
-    Copyright (c) Joris Van Damme <info@awaresystems.be>
-    Copyright (c) AWare Systems <http://www.awaresystems.be/>
-    Portions Copyright (C) 1985-1987, 1990 Regents of the University of California
-    Portions Copyright (C) 1990, 1991 Digital Equipment Corporation
-    Portions Copyright (C) 1990 Sun Microsystems, Inc.
-    Portions Copyright (C) 1990, 1995 Frank D. Cringle
-    Portions Copyright (C) 1996 BancTec AB
-    Portions Copyright (C) 1996 Mike Johnson
-    Portions Copyright (C) 1996 Pixar
-    Portions Copyright (C) 1997 Greg Ward Larson
-    Portions Copyright (C) 2000 Frank Warmerdam
-    Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
-    Copyright (c( 1996 USAF Phillips Laboratory
-    Additions (c) Richard Nolde 2006-2009 
+    Copyright (C) 1988-1997 Sam Leffler\br
+    Copyright (C) 1991-1997 Silicon Graphics, Inc.\br
+    Copyright (c) Joris Van Damme <info@awaresystems.be>\br
+    Copyright (c) AWare Systems <http://www.awaresystems.be/>\br
+    Portions Copyright (C) 1985-1987, 1990 Regents of the University of California\br
+    Portions Copyright (C) 1990, 1991 Digital Equipment Corporation\br
+    Portions Copyright (C) 1990 Sun Microsystems, Inc.\br
+    Portions Copyright (C) 1990, 1995 Frank D. Cringle\br
+    Portions Copyright (C) 1996 BancTec AB\br
+    Portions Copyright (C) 1996 Mike Johnson\br
+    Portions Copyright (C) 1996 Pixar\br
+    Portions Copyright (C) 1997 Greg Ward Larson\br
+    Portions Copyright (C) 2000 Frank Warmerdam\br
+    Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>\br
+    Copyright (c( 1996 USAF Phillips Laboratory\br
+    Additions (c) Richard Nolde 2006-2009
     
     Permission to use, copy, modify, distribute, and sell this software and 
     its documentation for any purpose is hereby granted without fee, provided
@@ -372,7 +372,7 @@
 
     \hr
 
-    Copyright (c) 1985, 1986 The Regents of the University of California.
+    Copyright (c) 1985, 1986 The Regents of the University of California.\br
     All rights reserved.
     
     This code is derived from software contributed to Berkeley by
@@ -393,7 +393,7 @@
 
     \hr
 
-    Copyright (c) 1996-1997 Sam Leffler
+    Copyright (c) 1996-1997 Sam Leffler\br
     Copyright (c) 1996 Pixar
     
     Permission to use, copy, modify, distribute, and sell this software and 
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
index 1e717cb..abe15c8 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
@@ -241,7 +241,7 @@ NEVER_INLINE CollectorBlock* Heap::allocateBlock()
 #elif PLATFORM(WINCE)
     void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 #elif PLATFORM(WIN_OS)
-#if COMPILER(MINGW)
+#if COMPILER(MINGW) && !PLATFORM(X86_64)
     void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
 #else
     void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
@@ -327,7 +327,7 @@ NEVER_INLINE void Heap::freeBlock(CollectorBlock* block)
 #elif PLATFORM(WINCE)
     VirtualFree(block, 0, MEM_RELEASE);
 #elif PLATFORM(WIN_OS)
-#if COMPILER(MINGW)
+#if COMPILER(MINGW) && !PLATFORM(X86_64)
     __mingw_aligned_free(block);
 #else
     _aligned_free(block);
@@ -617,7 +617,7 @@ static inline void* currentThreadStackBase()
         MOV pTib, EAX
     }
     return static_cast<void*>(pTib->StackBase);
-#elif PLATFORM(WIN_OS) && PLATFORM(X86_64) && COMPILER(MSVC)
+#elif PLATFORM(WIN_OS) && PLATFORM(X86_64) && (COMPILER(MSVC) ||COMPILER(GCC))
     PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb());
     return reinterpret_cast<void*>(pTib->StackBase);
 #elif PLATFORM(WIN_OS) && PLATFORM(X86) && COMPILER(GCC)
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 4d52c5d..bcb0b50 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -111,8 +111,9 @@ public:
         qreal scaleY;
         qreal rotation;
         qreal opacity;
-        static Fragment create(const QPointF &pos, const QRectF &sourceRect, qreal scaleX = 1,
-                               qreal scaleY = 1, qreal rotation = 0, qreal opacity = 1);
+        static Fragment Q_GUI_EXPORT create(const QPointF &pos, const QRectF &sourceRect,
+                                            qreal scaleX = 1, qreal scaleY = 1,
+                                            qreal rotation = 0, qreal opacity = 1);
     };
 
     enum FragmentHint {