Diff
Modified: trunk/ChangeLog (101261 => 101262)
--- trunk/ChangeLog 2011-11-28 15:44:51 UTC (rev 101261)
+++ trunk/ChangeLog 2011-11-28 15:50:01 UTC (rev 101262)
@@ -1,5 +1,14 @@
2011-11-28 Simon Hausmann <[email protected]>
+ [Qt] Build system fixes against V8.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Source/api.pri: Get rid of old v8 cruft.
+ * WebKit.pro: Don't build _javascript_Core when configured with v8.
+
+2011-11-28 Simon Hausmann <[email protected]>
+
[Qt] WTF should be built as separate static library
https://bugs.webkit.org/show_bug.cgi?id=73201
Modified: trunk/Source/WebCore/ChangeLog (101261 => 101262)
--- trunk/Source/WebCore/ChangeLog 2011-11-28 15:44:51 UTC (rev 101261)
+++ trunk/Source/WebCore/ChangeLog 2011-11-28 15:50:01 UTC (rev 101262)
@@ -1,3 +1,14 @@
+2011-11-28 Simon Hausmann <[email protected]>
+
+ [Qt] Build system fixes against V8.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * DerivedSources.pri: Add missing binding files to the build and also added
+ the regexp table generation needed for Yarr, which is compiled statically into
+ WebCore to implement WebCore::RegularExpression.
+ * Target.pri: Adapt to latest v8 binding files.
+
2011-11-28 Andrey Kosyakov <[email protected]>
Web Inspector: resource status image is mis-aligned in the network headers view
Modified: trunk/Source/WebCore/DerivedSources.pri (101261 => 101262)
--- trunk/Source/WebCore/DerivedSources.pri 2011-11-28 15:44:51 UTC (rev 101261)
+++ trunk/Source/WebCore/DerivedSources.pri 2011-11-28 15:50:01 UTC (rev 101262)
@@ -65,6 +65,8 @@
DEBUGGER_SCRIPT_SOURCE = $$PWD/bindings/v8/DebuggerScript.js
+ARRAY_BUFFER_VIEW_CUSTOM_SCRIPT_SOURCE = $$PWD/bindings/v8/custom/V8ArrayBufferViewCustomScript.js
+
contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=1): DASHBOARDSUPPORTCSSPROPERTIES = $$PWD/css/DashboardSupportCSSPropertyNames.in
XPATHBISON = $$PWD/xml/XPathGrammar.y
@@ -719,6 +721,12 @@
debuggerScriptSource.add_output_to_sources = false
GENERATORS += debuggerScriptSource
+arrayBufferViewCustomScript.output = V8ArrayBufferViewCustomScript.h
+arrayBufferViewCustomScript.input = ARRAY_BUFFER_VIEW_CUSTOM_SCRIPT_SOURCE
+arrayBufferViewCustomScript.commands = perl $$PWD/inspector/xxd.pl V8ArrayBufferViewCustomScript_js ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+arrayBufferViewCustomScript.add_output_to_sources = false
+GENERATORS += arrayBufferViewCustomScript
+
# GENERATOR 3: tokenizer (flex)
tokenizer.output = ${QMAKE_FILE_BASE}.cpp
tokenizer.input = TOKENIZER
@@ -862,3 +870,12 @@
webkitversion.clean = ${QMAKE_FUNC_FILE_OUT_PATH}/WebKitVersion.h
webkitversion.add_output_to_sources = false
GENERATORS += webkitversion
+
+# Stolen from _javascript_Core, needed for YARR
+v8 {
+ retgen.output = RegExpJitTables.h
+ retgen.script = $$PWD/../_javascript_Core/create_regex_tables
+ retgen.input = retgen.script
+ retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
+ GENERATORS += retgen
+}
Modified: trunk/Source/WebCore/Target.pri (101261 => 101262)
--- trunk/Source/WebCore/Target.pri 2011-11-28 15:44:51 UTC (rev 101261)
+++ trunk/Source/WebCore/Target.pri 2011-11-28 15:50:01 UTC (rev 101262)
@@ -67,10 +67,7 @@
v8 {
include($$PWD/../_javascript_Core/yarr/yarr.pri)
- include($$PWD/../_javascript_Core/wtf/wtf.pri)
- INCLUDEPATH = $$PWD/../_javascript_Core/wtf/qt $$INCLUDEPATH
-
SOURCES += \
platform/qt/PlatformSupportQt.cpp \
bindings/generic/BindingSecurityBase.cpp \
@@ -83,6 +80,7 @@
SOURCES += \
bindings/v8/custom/V8ArrayBufferCustom.cpp \
+ bindings/v8/custom/V8ArrayBufferViewCustom.cpp \
bindings/v8/custom/V8CustomXPathNSResolver.cpp \
bindings/v8/custom/V8DataViewCustom.cpp \
bindings/v8/custom/V8DeviceMotionEventCustom.cpp \
@@ -100,6 +98,7 @@
bindings/v8/DOMData.cpp \
bindings/v8/DOMDataStore.cpp \
bindings/v8/NPV8Object.cpp \
+ bindings/v8/OptionsObject.cpp \
bindings/v8/PageScriptDebugServer.cpp \
bindings/v8/RetainedDOMInfo.cpp \
bindings/v8/ScheduledAction.cpp \
@@ -1350,7 +1349,6 @@
bindings/v8/custom/V8CustomXPathNSResolver.h \
bindings/v8/custom/V8HTMLImageElementConstructor.h \
bindings/v8/custom/V8HTMLSelectElementCustom.h \
- bindings/v8/custom/V8MessagePortCustom.h \
bindings/v8/custom/V8NamedNodesCollection.h \
\
bindings/v8/DateExtension.h \
Modified: trunk/Source/WebKit/qt/ChangeLog (101261 => 101262)
--- trunk/Source/WebKit/qt/ChangeLog 2011-11-28 15:44:51 UTC (rev 101261)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-11-28 15:50:01 UTC (rev 101262)
@@ -1,3 +1,19 @@
+2011-11-28 Simon Hausmann <[email protected]>
+
+ [Qt] Build system fixes against V8.
+
+ Reviewed by Tor Arne Vestbø.
+
+ Add forwarding headers for building against Qt's v8 with
+ v8 include style.
+
+ * v8/ForwardingHeaders/v8-debug.h: Added.
+ * v8/ForwardingHeaders/v8-preparser.h: Added.
+ * v8/ForwardingHeaders/v8-profiler.h: Added.
+ * v8/ForwardingHeaders/v8-testing.h: Added.
+ * v8/ForwardingHeaders/v8.h: Added.
+ * v8/ForwardingHeaders/v8stdint.h: Added.
+
2011-11-26 Pavel Feldman <[email protected]>
Web Inspector: remove disconnectFromBackend from the protocol.
Added: trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-debug.h (0 => 101262)
--- trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-debug.h (rev 0)
+++ trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-debug.h 2011-11-28 15:50:01 UTC (rev 101262)
@@ -0,0 +1 @@
+#include <private/v8-debug.h>
Added: trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-preparser.h (0 => 101262)
--- trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-preparser.h (rev 0)
+++ trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-preparser.h 2011-11-28 15:50:01 UTC (rev 101262)
@@ -0,0 +1 @@
+#include <private/v8-preparser.h>
Added: trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-profiler.h (0 => 101262)
--- trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-profiler.h (rev 0)
+++ trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-profiler.h 2011-11-28 15:50:01 UTC (rev 101262)
@@ -0,0 +1 @@
+#include <private/v8-profiler.h>
Added: trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-testing.h (0 => 101262)
--- trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-testing.h (rev 0)
+++ trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8-testing.h 2011-11-28 15:50:01 UTC (rev 101262)
@@ -0,0 +1 @@
+#include <private/v8-testing.h>
Added: trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8.h (0 => 101262)
--- trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8.h (rev 0)
+++ trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8.h 2011-11-28 15:50:01 UTC (rev 101262)
@@ -0,0 +1 @@
+#include <private/v8.h>
Added: trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8stdint.h (0 => 101262)
--- trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8stdint.h (rev 0)
+++ trunk/Source/WebKit/qt/v8/ForwardingHeaders/v8stdint.h 2011-11-28 15:50:01 UTC (rev 101262)
@@ -0,0 +1 @@
+#include <private/v8stdint.h>
Modified: trunk/Source/api.pri (101261 => 101262)
--- trunk/Source/api.pri 2011-11-28 15:44:51 UTC (rev 101261)
+++ trunk/Source/api.pri 2011-11-28 15:50:01 UTC (rev 101262)
@@ -30,11 +30,6 @@
QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri
}
-v8:linux-* {
- QMAKE_LIBDIR += $${V8_LIB_DIR}
- LIBS = -lv8 $$LIBS
-}
-
QT += network
haveQt(5): QT += widgets printsupport
Modified: trunk/Tools/ChangeLog (101261 => 101262)
--- trunk/Tools/ChangeLog 2011-11-28 15:44:51 UTC (rev 101261)
+++ trunk/Tools/ChangeLog 2011-11-28 15:50:01 UTC (rev 101262)
@@ -1,3 +1,13 @@
+2011-11-28 Simon Hausmann <[email protected]>
+
+ [Qt] Build system fixes against V8.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/webcore.prf: Get rid of old v8 cruft.
+ * qmake/mkspecs/features/wtf.prf: If requested, pull in v8 from Qt and configure
+ WTF accordingly to use v8. (WTF in the implementation needs it as well as users of WTF)
+
2011-11-28 Kenneth Rohde Christiansen <[email protected]>
Make sure the useFixedLayout feature is consistently handled
Modified: trunk/Tools/qmake/mkspecs/features/webcore.prf (101261 => 101262)
--- trunk/Tools/qmake/mkspecs/features/webcore.prf 2011-11-28 15:44:51 UTC (rev 101261)
+++ trunk/Tools/qmake/mkspecs/features/webcore.prf 2011-11-28 15:50:01 UTC (rev 101262)
@@ -25,21 +25,7 @@
WEBCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebCore/$${GENERATED_SOURCES_DESTDIR}
v8 {
- !haveQt(5): error("To build QtWebKit+V8 you need qtscript-staging's v8 branch. (See: http://qt.gitorious.org/+qt-developers/qt/qtscript-staging)")
- !exists($${V8_DIR}$${QMAKE_DIR_SEP}include$${QMAKE_DIR_SEP}v8.h): error("Cannot build with V8. Needed file $${V8_DIR}$${QMAKE_DIR_SEP}include$${QMAKE_DIR_SEP}v8.h does not exist.")
- !exists($${V8_LIB_DIR}$${QMAKE_DIR_SEP}libv8.a): error("Cannot build with V8. Needed library $${V8_LIB_DIR}$${QMAKE_DIR_SEP}libv8.a does not exist.")
-
- message(Using V8 with QtScript)
-
- V8_DIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/v8
- V8_LIB_DIR = $$[QT_INSTALL_PREFIX]/src/script/v8
-
- QT += script
- INCLUDEPATH += $${V8_DIR}/include
-
DEFINES *= V8_BINDING=1
- DEFINES *= WTF_CHANGES=1
- DEFINES *= WTF_USE_V8=1
WEBCORE_INCLUDEPATH = \
$$SOURCE_DIR/WebCore/bindings/v8 \
Modified: trunk/Tools/qmake/mkspecs/features/wtf.prf (101261 => 101262)
--- trunk/Tools/qmake/mkspecs/features/wtf.prf 2011-11-28 15:44:51 UTC (rev 101261)
+++ trunk/Tools/qmake/mkspecs/features/wtf.prf 2011-11-28 15:50:01 UTC (rev 101262)
@@ -36,6 +36,13 @@
DEFINES -= WTF_USE_ICU_UNICODE
}
+v8 {
+ !haveQt(5): error("To build QtWebKit+V8 you need to use Qt 5")
+ DEFINES *= WTF_USE_V8=1
+ INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/v8/ForwardingHeaders
+ QT += v8-private declarative
+}
+
linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
!contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
DEFINES += ENABLE_GLIB_SUPPORT=1
Modified: trunk/WebKit.pro (101261 => 101262)
--- trunk/WebKit.pro 2011-11-28 15:44:51 UTC (rev 101261)
+++ trunk/WebKit.pro 2011-11-28 15:50:01 UTC (rev 101262)
@@ -18,7 +18,7 @@
WTF.makefile = Makefile.WTF
SUBDIRS += WTF
-!CONFIG(v8) {
+!v8 {
_javascript_Core.file = Source/_javascript_Core/_javascript_Core.pro
_javascript_Core.makefile = Makefile._javascript_Core
