diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-01 14:37:11 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-01 14:37:11 (GMT) |
| commit | c57dcf1b8601d436efca8ab4070ebc82c3d63a95 (patch) | |
| tree | 5fd00e69e443196f4f493daccd35e3f957e368b8 /src/3rdparty/javascriptcore | |
| parent | 931ede896c1b4b0250a8503980c3da5478e5adc1 (diff) | |
| parent | bfd43c0d7d7e107cd20ace6603f68a6304be0821 (diff) | |
| download | Qt-c57dcf1b8601d436efca8ab4070ebc82c3d63a95.zip Qt-c57dcf1b8601d436efca8ab4070ebc82c3d63a95.tar.gz Qt-c57dcf1b8601d436efca8ab4070ebc82c3d63a95.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits)
QVariant documentation: there is no function QVariant::isEmpty()
Added caching of vectorpaths to the GL paint engine.
Extended tst_QListView::indexAt to test viewport bounds.
Fix QFontCombobox autotest on X11
In QListViews, items were being hovered even when mouse was on the scrollbars
Fix crash in qt3support QPixmap constructor
Fix tst_qsharedmemory on Unix
Doc: Fixed up a known issue.
Only call updateFont if the font have changed.
Add some notes about known issues for win32-icc
Fixed square root of negative number in drawTextItem().
Fixed the GL2 engine stroker to handle Qt::SvgMiterJoin.
Do not fill the disabled background of item.
X11: Avoid loading all fonts in system for text with line breaks
Do not recoginze templated types or pointers as flags.
Compile webkit for win32-icc
Fix tst_qspinbox compilation with winscw.
compile fix for autotest
compile fix for autotest
state wasn't being correctly reloaded on mac with unified toolbar
...
Diffstat (limited to 'src/3rdparty/javascriptcore')
| -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 |