diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-27 11:46:44 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-27 11:46:44 (GMT) |
| commit | d6b91331fe9a96c0abab72fccbcc6b5fa425a459 (patch) | |
| tree | 39d453a4075101714044afe2d0a0bc9e783c1839 | |
| parent | 00d5e1bc789cd27d2decb150426a1c7620c73bc9 (diff) | |
| download | Qt-d6b91331fe9a96c0abab72fccbcc6b5fa425a459.zip Qt-d6b91331fe9a96c0abab72fccbcc6b5fa425a459.tar.gz Qt-d6b91331fe9a96c0abab72fccbcc6b5fa425a459.tar.bz2 | |
Compile QtScript for win32-icc
Reviewed-by: Kent Hansen
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/WebKit.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h index 56659a8..c03e8a7 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h +++ b/src/3rdparty/javascriptcore/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/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri index 8291f30..16f89bf 100644 --- a/src/3rdparty/javascriptcore/WebKit.pri +++ b/src/3rdparty/javascriptcore/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 |