diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-30 11:15:00 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-30 11:15:00 (GMT) |
| commit | 1d5621a4958ab6f250566c26f891d3e99c6f8585 (patch) | |
| tree | cdd57780823502f296a245a25842202cf9611b8e /src/3rdparty | |
| parent | 47ad7aae65756f4d646cd70db563d5a394c23ab2 (diff) | |
| download | Qt-1d5621a4958ab6f250566c26f891d3e99c6f8585.zip Qt-1d5621a4958ab6f250566c26f891d3e99c6f8585.tar.gz Qt-1d5621a4958ab6f250566c26f891d3e99c6f8585.tar.bz2 | |
Compile webkit for win32-icc
The reason for the first hunk is that 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).
The second hunk is simply for including stdint.h since MS does not
ship that in their PSDK.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/TypeTraits.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/TypeTraits.h b/src/3rdparty/webkit/JavaScriptCore/wtf/TypeTraits.h index 6ce6a3e..9e75e7a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/TypeTraits.h +++ b/src/3rdparty/webkit/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/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri index 10291b4..5188662 100644 --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/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 |