Diff
Modified: trunk/ChangeLog (92554 => 92555)
--- trunk/ChangeLog 2011-08-06 17:09:29 UTC (rev 92554)
+++ trunk/ChangeLog 2011-08-06 19:52:39 UTC (rev 92555)
@@ -1,3 +1,16 @@
+2011-08-06 Aron Rosenberg <[email protected]>
+
+ Reviewed by Benjamin Poulain.
+
+ [Qt] Fix build with Intel compiler on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=65088
+
+ Disable Intel Compiler warning 873 - function "" has no corresponding operator
+ delete (to be called if an exception is thrown during initialization of an
+ allocated object).
+
+ * Source/WebKit.pri:
+
2011-08-03 Kevin Ollivier <[email protected]>
[wx] Unreviewed build fix after gesture recognizer changes.
Modified: trunk/Source/_javascript_Core/ChangeLog (92554 => 92555)
--- trunk/Source/_javascript_Core/ChangeLog 2011-08-06 17:09:29 UTC (rev 92554)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-08-06 19:52:39 UTC (rev 92555)
@@ -1,3 +1,19 @@
+2011-08-06 Aron Rosenberg <[email protected]>
+
+ Reviewed by Benjamin Poulain.
+
+ [Qt] Fix build with Intel compiler on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=65088
+
+ Intel compiler needs .lib suffixes instead of .a
+ Intel compiler doesn't support nullptr
+ Intel compiler supports unsized arrays
+
+ * _javascript_Core.pri:
+ * jsc.cpp:
+ * wtf/ByteArray.h:
+ * wtf/NullPtr.h:
+
2011-08-05 Gavin Barraclough <[email protected]>
String replace with the empty string means string removal
Modified: trunk/Source/_javascript_Core/_javascript_Core.pri (92554 => 92555)
--- trunk/Source/_javascript_Core/_javascript_Core.pri 2011-08-06 17:09:29 UTC (rev 92554)
+++ trunk/Source/_javascript_Core/_javascript_Core.pri 2011-08-06 19:52:39 UTC (rev 92555)
@@ -76,7 +76,7 @@
# Argument is the relative path to _javascript_Core.pro's qmake output
pathToJavaScriptCoreOutput = $$ARGS/$$_javascript_CORE_DESTDIR
- win32-msvc*|wince* {
+ win32-msvc*|wince*|win32-icc {
LIBS = -l$$_javascript_CORE_TARGET $$LIBS
LIBS = -L$$pathToJavaScriptCoreOutput $$LIBS
POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}$${_javascript_CORE_TARGET}.lib
Modified: trunk/Source/_javascript_Core/jsc.cpp (92554 => 92555)
--- trunk/Source/_javascript_Core/jsc.cpp 2011-08-06 17:09:29 UTC (rev 92554)
+++ trunk/Source/_javascript_Core/jsc.cpp 2011-08-06 19:52:39 UTC (rev 92555)
@@ -340,7 +340,7 @@
// be in a separate main function because the jscmain function requires object
// unwinding.
-#if COMPILER(MSVC) && !defined(_DEBUG) && !OS(WINCE)
+#if COMPILER(MSVC) && !COMPILER(INTEL) && !defined(_DEBUG) && !OS(WINCE)
#define TRY __try {
#define EXCEPT(x) } __except (EXCEPTION_EXECUTE_HANDLER) { x; }
#else
Modified: trunk/Source/_javascript_Core/wtf/ByteArray.h (92554 => 92555)
--- trunk/Source/_javascript_Core/wtf/ByteArray.h 2011-08-06 17:09:29 UTC (rev 92554)
+++ trunk/Source/_javascript_Core/wtf/ByteArray.h 2011-08-06 19:52:39 UTC (rev 92555)
@@ -91,7 +91,7 @@
// MSVC can't handle correctly unsized array.
// warning C4200: nonstandard extension used : zero-sized array in struct/union
// Cannot generate copy-ctor or copy-assignment operator when UDT contains a zero-sized array
-#if COMPILER(MSVC)
+#if COMPILER(MSVC) && !COMPILER(INTEL)
unsigned char m_data[INT_MAX];
#else
unsigned char m_data[];
Modified: trunk/Source/_javascript_Core/wtf/NullPtr.h (92554 => 92555)
--- trunk/Source/_javascript_Core/wtf/NullPtr.h 2011-08-06 17:09:29 UTC (rev 92554)
+++ trunk/Source/_javascript_Core/wtf/NullPtr.h 2011-08-06 19:52:39 UTC (rev 92555)
@@ -35,7 +35,7 @@
#define __has_feature(feature) 0
#endif
-#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600)
+#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL))
#define HAVE_NULLPTR 1
Modified: trunk/Source/WebCore/ChangeLog (92554 => 92555)
--- trunk/Source/WebCore/ChangeLog 2011-08-06 17:09:29 UTC (rev 92554)
+++ trunk/Source/WebCore/ChangeLog 2011-08-06 19:52:39 UTC (rev 92555)
@@ -1,3 +1,14 @@
+2011-08-06 Aron Rosenberg <[email protected]>
+
+ Reviewed by Benjamin Poulain.
+
+ [Qt] Fix build with Intel compiler on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=65088
+
+ Intel compiler needs .lib suffixes instead of .a
+
+ * WebCore.pri:
+
2011-08-06 Dan Bernstein <[email protected]>
Move the shared LineBreakIteratorPool from ThreadGlobalData into its own ThreadSpecific
Modified: trunk/Source/WebCore/WebCore.pri (92554 => 92555)
--- trunk/Source/WebCore/WebCore.pri 2011-08-06 17:09:29 UTC (rev 92554)
+++ trunk/Source/WebCore/WebCore.pri 2011-08-06 19:52:39 UTC (rev 92555)
@@ -355,7 +355,7 @@
defineTest(prependWebCoreLib) {
pathToWebCoreOutput = $$ARGS/$$WEBCORE_DESTDIR
- win32-msvc*|wince* {
+ win32-msvc*|wince*|win32-icc {
LIBS = -l$$WEBCORE_TARGET $$LIBS
LIBS = -L$$pathToWebCoreOutput $$LIBS
POST_TARGETDEPS += $${pathToWebCoreOutput}$${QMAKE_DIR_SEP}$${WEBCORE_TARGET}.lib
Modified: trunk/Source/WebKit.pri (92554 => 92555)
--- trunk/Source/WebKit.pri 2011-08-06 17:09:29 UTC (rev 92554)
+++ trunk/Source/WebKit.pri 2011-08-06 19:52:39 UTC (rev 92555)
@@ -159,6 +159,7 @@
# Disable a few warnings on Windows. The warnings are also
# disabled in WebKitLibraries/win/tools/vsprops/common.vsprops
win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996
+win32-icc: QMAKE_CXXFLAGS += -wd873
CONFIG(qt_minimal) {
DEFINES *= QT_NO_ANIMATION
Modified: trunk/Source/WebKit2/ChangeLog (92554 => 92555)
--- trunk/Source/WebKit2/ChangeLog 2011-08-06 17:09:29 UTC (rev 92554)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-06 19:52:39 UTC (rev 92555)
@@ -1,3 +1,14 @@
+2011-08-06 Aron Rosenberg <[email protected]>
+
+ Reviewed by Benjamin Poulain.
+
+ [Qt] Fix build with Intel compiler on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=65088
+
+ Intel compiler needs .lib suffixes instead of .a
+
+ * WebKit2.pri:
+
2011-08-05 Darin Adler <[email protected]>
Reviewed by Anders Carlsson.
Modified: trunk/Source/WebKit2/WebKit2.pri (92554 => 92555)
--- trunk/Source/WebKit2/WebKit2.pri 2011-08-06 17:09:29 UTC (rev 92554)
+++ trunk/Source/WebKit2/WebKit2.pri 2011-08-06 19:52:39 UTC (rev 92555)
@@ -66,7 +66,7 @@
defineTest(prependWebKit2Lib) {
pathToWebKit2Output = $$ARGS/$$WEBKIT2_DESTDIR
- win32-msvc*|wince* {
+ win32-msvc*|wince*|win32-icc {
LIBS = -l$$WEBKIT2_TARGET $$LIBS
LIBS = -L$$pathToWebKit2Output $$LIBS
POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}$${WEBKIT2_TARGET}.lib
