[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 6eb95ffc58e9f987cfdc6e7a0ef6eb07f540ea16
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 30 11:27:51 2009 +0000

    [Qt] Fix compilation with win32-icc
    
    Patch by Jan-Arve Sæther <jan-arve.saether at nokia.com> on 2009-11-30
    Reviewed by Simon Hausmann.
    
    .:
    
    Include os-win32 for stdint.h since MS does not ship that in their PSDK.
    
    * WebKit.pri:
    
    JavaScriptCore:
    
    The Intel compiler does not support the __has_trivial_constructor type
    trait.  The Intel Compiler can report itself as _MSC_VER >= 1400. The
    reason for that is that the Intel Compiler depends on the Microsoft
    Platform SDK, and in order to try to be "fully" MS compatible it will
    "pretend" to be the same MS compiler as was shipped with the MS PSDK.
    (Thus, compiling with win32-icc with VC8 SDK will make the source code
    "think" the compiler at hand supports this type trait).
    
    * wtf/TypeTraits.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51484 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 864a51e..dd80c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-30  Jan-Arve Sæther  <jan-arve.saether at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix compilation with win32-icc
+
+        Include os-win32 for stdint.h since MS does not ship that in their PSDK.
+
+        * WebKit.pri:
+
 2009-11-26  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 24ba993..5e1f68f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-30  Jan-Arve Sæther  <jan-arve.saether at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix compilation with win32-icc
+
+        The Intel compiler does not support the __has_trivial_constructor type
+        trait.  The Intel Compiler can report itself as _MSC_VER >= 1400. The
+        reason for that is that the Intel Compiler depends on the Microsoft
+        Platform SDK, and in order to try to be "fully" MS compatible it will
+        "pretend" to be the same MS compiler as was shipped with the MS PSDK.
+        (Thus, compiling with win32-icc with VC8 SDK will make the source code
+        "think" the compiler at hand supports this type trait).
+
+        * wtf/TypeTraits.h:
+
 2009-11-29  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Eric Seidel.
diff --git a/JavaScriptCore/wtf/TypeTraits.h b/JavaScriptCore/wtf/TypeTraits.h
index 6ce6a3e..9e75e7a 100644
--- a/JavaScriptCore/wtf/TypeTraits.h
+++ b/JavaScriptCore/wtf/TypeTraits.h
@@ -155,7 +155,7 @@ namespace WTF {
     typedef IntegralConstant<bool, true>  true_type;
     typedef IntegralConstant<bool, false> false_type;
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__INTEL_COMPILER)
     // VC8 (VS2005) and later have built-in compiler support for HasTrivialConstructor / HasTrivialDestructor,
     // but for some unexplained reason it doesn't work on built-in types.
     template <typename T> struct HasTrivialConstructor : public IntegralConstant<bool, __has_trivial_constructor(T)>{ };
diff --git a/WebKit.pri b/WebKit.pri
index a01cb21..d7abc54 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -11,7 +11,7 @@ isEmpty(OUTPUT_DIR) {
 
 DEFINES += BUILDING_QT__=1
 building-libs {
-    win32-msvc*: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
+    win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
 } else {
     CONFIG(QTDIR_build) {
         QT += webkit

-- 
WebKit Debian packaging