Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (114041 => 114042)
--- trunk/Source/_javascript_Core/ChangeLog 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-04-12 22:28:03 UTC (rev 114042)
@@ -1,3 +1,12 @@
+2012-04-12 Balazs Kelemen <[email protected]>
+
+ [Qt] Fix WebKit1 build with V8
+ https://bugs.webkit.org/show_bug.cgi?id=83322
+
+ Reviewed by Adam Barth.
+
+ * yarr/yarr.pri:
+
2012-04-12 Gavin Barraclough <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=83821
Modified: trunk/Source/_javascript_Core/yarr/yarr.pri (114041 => 114042)
--- trunk/Source/_javascript_Core/yarr/yarr.pri 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/_javascript_Core/yarr/yarr.pri 2012-04-12 22:28:03 UTC (rev 114042)
@@ -11,4 +11,8 @@
$$PWD/YarrCanonicalizeUCS2.cpp
# For UString.h
-v8: INCLUDEPATH += $$PWD/../runtime
+v8 {
+ INCLUDEPATH += \
+ $$PWD/.. \
+ $$PWD/../runtime
+}
Modified: trunk/Source/WTF/ChangeLog (114041 => 114042)
--- trunk/Source/WTF/ChangeLog 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WTF/ChangeLog 2012-04-12 22:28:03 UTC (rev 114042)
@@ -1,3 +1,13 @@
+2012-04-12 Balazs Kelemen <[email protected]>
+
+ [Qt] Fix WebKit1 build with V8
+ https://bugs.webkit.org/show_bug.cgi?id=83322
+
+ Reviewed by Adam Barth.
+
+ * wtf/StdLibExtras.h:
+ (WTF):
+
2012-04-12 Jer Noble <[email protected]>
ThreadingWin: Mutex::unlock() can be "over-unlocked".
Modified: trunk/Source/WTF/wtf/StdLibExtras.h (114041 => 114042)
--- trunk/Source/WTF/wtf/StdLibExtras.h 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WTF/wtf/StdLibExtras.h 2012-04-12 22:28:03 UTC (rev 114042)
@@ -151,6 +151,10 @@
// Macro that returns a compile time constant with the length of an array, but gives an error if passed a non-array.
template<typename T, size_t Size> char (&ArrayLengthHelperFunction(T (&)[Size]))[Size];
+// GCC needs some help to deduce a 0 length array.
+#if COMPILER(GCC)
+template<typename T> char (&ArrayLengthHelperFunction(T (&)[0]))[0];
+#endif
#define WTF_ARRAY_LENGTH(array) sizeof(::WTF::ArrayLengthHelperFunction(array))
// Efficient implementation that takes advantage of powers of two.
Modified: trunk/Source/WebCore/ChangeLog (114041 => 114042)
--- trunk/Source/WebCore/ChangeLog 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/ChangeLog 2012-04-12 22:28:03 UTC (rev 114042)
@@ -1,3 +1,50 @@
+2012-04-12 Balazs Kelemen <[email protected]>
+
+ [Qt] Fix WebKit1 build with V8
+ https://bugs.webkit.org/show_bug.cgi?id=83322
+
+ Reviewed by Adam Barth.
+
+ Make it possible to build WebKit1 with v8.
+ WebKit2 is not covered yet so it need to be disabled.
+ To build webkit with --v8 one need a qtjsbackend with
+ an up-to-date copy of v8. Thanks to Peter Varga such
+ a public repository is available on gitorious:
+ https://qt.gitorious.org/~stampho/qt/stamphos-qtjsbackend.
+
+ This patch contains some build fix with !ENABLE(INSPECTOR)
+ from it's previous version. These are not necessary now
+ but I kept them because they makes sense.
+
+ No change in behaviour so no new tests.
+
+ * DerivedSources.pri:
+ * Target.pri:
+ * WebCore.pri:
+ * bindings/v8/ScriptController.cpp:
+ * bindings/v8/ScriptControllerQt.cpp:
+ * bindings/v8/ScriptProfiler.cpp:
+ (WebCore::retainedDOMInfo):
+ (WebCore::ScriptProfiler::initialize):
+ * bindings/v8/ScriptState.cpp:
+ (WebCore::evalEnabled):
+ (WebCore::setEvalEnabled):
+ * bindings/v8/V8Binding.cpp:
+ (WebCore):
+ * bindings/v8/V8Binding.h:
+ (V8BindingPerIsolateData):
+ * bindings/v8/V8DOMWindowShell.cpp:
+ (WebCore::V8DOMWindowShell::initContextIfNeeded):
+ * bindings/v8/V8GCForContextDispose.cpp:
+ (WebCore::V8GCForContextDispose::pseudoIdleTimerFired):
+ * bindings/v8/custom/V8InjectedScriptManager.cpp:
+ * config.h:
+ * editing/TextIterator.cpp:
+ * html/MediaFragmentURIParser.cpp:
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ * platform/qt/PlatformSupportQt.cpp:
+ (WebCore::PlatformSupport::popupsAllowed):
+
2012-04-12 Alec Flett <[email protected]>
IndexedDB: Refactor cursor iteration to remove duplicate code
Modified: trunk/Source/WebCore/DerivedSources.pri (114041 => 114042)
--- trunk/Source/WebCore/DerivedSources.pri 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-04-12 22:28:03 UTC (rev 114042)
@@ -456,8 +456,8 @@
v8 {
IDL_BINDINGS += \
$$PWD/html/canvas/CanvasPixelArray.idl \
- $$PWD/storage/IDBVersionChangeEvent.idl \
- $$PWD/storage/IDBVersionChangeRequest.idl
+ $$PWD/Modules/indexeddb/IDBVersionChangeEvent.idl \
+ $$PWD/Modules/indexeddb/IDBVersionChangeRequest.idl
}
contains(DEFINES, ENABLE_SVG=1) {
Modified: trunk/Source/WebCore/Target.pri (114041 => 114042)
--- trunk/Source/WebCore/Target.pri 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/Target.pri 2012-04-12 22:28:03 UTC (rev 114042)
@@ -103,6 +103,7 @@
bindings/v8/custom/V8Uint8ArrayCustom.cpp \
bindings/v8/custom/V8Uint16ArrayCustom.cpp \
bindings/v8/custom/V8Uint32ArrayCustom.cpp \
+ bindings/v8/custom/V8Uint8ClampedArrayCustom.cpp \
\
bindings/v8/DateExtension.cpp \
bindings/v8/DOMData.cpp \
@@ -130,6 +131,7 @@
bindings/v8/SerializedScriptValue.cpp \
bindings/v8/V8AbstractEventListener.cpp \
bindings/v8/V8Binding.cpp \
+ bindings/v8/V8BindingPerContextData.cpp \
bindings/v8/V8Collection.cpp \
bindings/v8/V8DOMMap.cpp \
bindings/v8/V8DOMWrapper.cpp \
@@ -4095,4 +4097,3 @@
# Make sure the derived sources are built
include(DerivedSources.pri)
-
Modified: trunk/Source/WebCore/bindings/v8/ScriptController.cpp (114041 => 114042)
--- trunk/Source/WebCore/bindings/v8/ScriptController.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/bindings/v8/ScriptController.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -70,7 +70,7 @@
#include <wtf/text/CString.h>
#if PLATFORM(QT)
-#include <QJSEngine>
+#include <QtQml/QJSEngine>
#endif
namespace WebCore {
Modified: trunk/Source/WebCore/bindings/v8/ScriptControllerQt.cpp (114041 => 114042)
--- trunk/Source/WebCore/bindings/v8/ScriptControllerQt.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/bindings/v8/ScriptControllerQt.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -28,7 +28,7 @@
#include "config.h"
#include "ScriptController.h"
-#include <QJSEngine>
+#include <QtQml/QJSEngine>
namespace WebCore {
Modified: trunk/Source/WebCore/bindings/v8/ScriptProfiler.cpp (114041 => 114042)
--- trunk/Source/WebCore/bindings/v8/ScriptProfiler.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/bindings/v8/ScriptProfiler.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -29,6 +29,7 @@
*/
#include "config.h"
+#if ENABLE(INSPECTOR)
#include "ScriptProfiler.h"
#include "DOMWrapperVisitor.h"
@@ -43,7 +44,6 @@
namespace WebCore {
-#if ENABLE(INSPECTOR)
void ScriptProfiler::start(ScriptState* state, const String& title)
{
v8::HandleScope hs;
@@ -163,13 +163,10 @@
Node* node = V8Node::toNative(wrapper.As<v8::Object>());
return node ? new RetainedDOMInfo(node) : 0;
}
-#endif // ENABLE(INSPECTOR)
void ScriptProfiler::initialize()
{
-#if ENABLE(INSPECTOR)
v8::HeapProfiler::DefineWrapperClass(v8DOMSubtreeClassId, &retainedDOMInfo);
-#endif // ENABLE(INSPECTOR)
}
void ScriptProfiler::visitJSDOMWrappers(DOMWrapperVisitor* visitor)
@@ -194,3 +191,5 @@
}
} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/bindings/v8/V8Binding.cpp (114041 => 114042)
--- trunk/Source/WebCore/bindings/v8/V8Binding.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/bindings/v8/V8Binding.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -177,6 +177,7 @@
#endif
};
+#if ENABLE(INSPECTOR)
void V8BindingPerIsolateData::visitJSExternalStrings(DOMWrapperVisitor* visitor)
{
v8::HandleScope handleScope;
@@ -195,6 +196,7 @@
} v8Visitor(visitor);
v8::V8::VisitExternalResources(&v8Visitor);
}
+#endif
String v8ValueToWebCoreString(v8::Handle<v8::Value> value)
{
Modified: trunk/Source/WebCore/bindings/v8/V8Binding.h (114041 => 114042)
--- trunk/Source/WebCore/bindings/v8/V8Binding.h 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/bindings/v8/V8Binding.h 2012-04-12 22:28:03 UTC (rev 114042)
@@ -124,8 +124,9 @@
}
StringCache* stringCache() { return &m_stringCache; }
+#if ENABLE(INSPECTOR)
void visitJSExternalStrings(DOMWrapperVisitor*);
-
+#endif
DOMDataList& allStores() { return m_domDataList; }
V8HiddenPropertyName* hiddenPropertyName() { return &m_hiddenPropertyName; }
Modified: trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp (114041 => 114042)
--- trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -294,9 +294,9 @@
v8::V8::AddMessageListener(&v8UncaughtExceptionHandler);
v8::V8::SetFailedAccessCheckCallbackFunction(reportUnsafeJavaScriptAccess);
-
+#if ENABLE(_javascript__DEBUGGER)
ScriptProfiler::initialize();
-
+#endif
V8BindingPerIsolateData::ensureInitialized(v8::Isolate::GetCurrent());
isV8Initialized = true;
Modified: trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptManager.cpp (114041 => 114042)
--- trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptManager.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptManager.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -29,6 +29,7 @@
*/
#include "config.h"
+#if ENABLE(INSPECTOR)
#include "InjectedScriptManager.h"
#include "DOMWindow.h"
@@ -171,3 +172,5 @@
}
} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/config.h (114041 => 114042)
--- trunk/Source/WebCore/config.h 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/config.h 2012-04-12 22:28:03 UTC (rev 114042)
@@ -34,9 +34,14 @@
#endif
#include <wtf/ExportMacros.h>
-#include <runtime/JSExportMacros.h>
#include "PlatformExportMacros.h"
+#if PLATFORM(QT) && USE(V8)
+#include <_javascript_Core/runtime/JSExportMacros.h>
+#else
+#include <runtime/JSExportMacros.h>
+#endif
+
#ifdef __APPLE__
#define HAVE_FUNC_USLEEP 1
#endif /* __APPLE__ */
Modified: trunk/Source/WebCore/dom/RequestAnimationFrameCallback.h (114041 => 114042)
--- trunk/Source/WebCore/dom/RequestAnimationFrameCallback.h 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/dom/RequestAnimationFrameCallback.h 2012-04-12 22:28:03 UTC (rev 114042)
@@ -31,6 +31,7 @@
#ifndef RequestAnimationFrameCallback_h
#define RequestAnimationFrameCallback_h
+#include "DOMTimeStamp.h"
#include <wtf/RefCounted.h>
namespace WebCore {
Modified: trunk/Source/WebCore/editing/TextIterator.cpp (114041 => 114042)
--- trunk/Source/WebCore/editing/TextIterator.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -43,6 +43,7 @@
#include "TextBreakIterator.h"
#include "VisiblePosition.h"
#include "visible_units.h"
+#include <wtf/text/CString.h>
#include <wtf/unicode/CharacterNames.h>
#if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
Modified: trunk/Source/WebCore/html/MediaFragmentURIParser.cpp (114041 => 114042)
--- trunk/Source/WebCore/html/MediaFragmentURIParser.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/html/MediaFragmentURIParser.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -33,6 +33,7 @@
#include "ProcessingInstruction.h"
#include "SegmentedString.h"
#include "Text.h"
+#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp (114041 => 114042)
--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -35,6 +35,7 @@
#include "InspectorFrontendClientLocal.h"
#include "Chrome.h"
+#include "Document.h"
#include "FloatRect.h"
#include "Frame.h"
#include "FrameLoadRequest.h"
@@ -53,6 +54,7 @@
#include "UserGestureIndicator.h"
#include "WindowFeatures.h"
#include <wtf/Deque.h>
+#include <wtf/text/CString.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (114041 => 114042)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -45,6 +45,7 @@
#include <wtf/ArrayBufferView.h>
#include <wtf/Float32Array.h>
#include <wtf/Int32Array.h>
+#include <wtf/OwnArrayPtr.h>
#include <wtf/Uint8Array.h>
#include <wtf/UnusedParam.h>
#include <wtf/text/CString.h>
Modified: trunk/Source/WebCore/platform/qt/PlatformSupportQt.cpp (114041 => 114042)
--- trunk/Source/WebCore/platform/qt/PlatformSupportQt.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebCore/platform/qt/PlatformSupportQt.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -31,8 +31,10 @@
bool PlatformSupport::popupsAllowed(NPP npp)
{
+#if ENABLE(NETSCAPE_PLUGIN_API)
if (npp && npp->ndata)
return static_cast<PluginView*>(npp->ndata)->arePopupsAllowed();
+#endif
return false;
}
Modified: trunk/Source/WebKit/qt/ChangeLog (114041 => 114042)
--- trunk/Source/WebKit/qt/ChangeLog 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-04-12 22:28:03 UTC (rev 114042)
@@ -1,3 +1,17 @@
+2012-04-12 Balazs Kelemen <[email protected]>
+
+ [Qt] Fix WebKit1 build with V8
+ https://bugs.webkit.org/show_bug.cgi?id=83322
+
+ Reviewed by Adam Barth.
+
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+ (WebCore::FrameLoaderClientQt::didCreateScriptContext):
+ * WebCoreSupport/FrameLoaderClientQt.h:
+ (FrameLoaderClientQt):
+ (WebCore::FrameLoaderClientQt::allowScriptExtension):
+ * WebCoreSupport/InitWebCoreQt.cpp:
+
2012-03-05 Pierre Rossi <[email protected]>
[Qt] Use QRawFont when building with Qt 5
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (114041 => 114042)
--- trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -397,7 +397,7 @@
}
#if USE(V8)
-void FrameLoaderClientQt::didCreateScriptContext(v8::Handle<v8::Context>, int)
+void FrameLoaderClientQt::didCreateScriptContext(v8::Handle<v8::Context>, int, int)
{
}
void FrameLoaderClientQt::willReleaseScriptContext(v8::Handle<v8::Context>, int)
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h (114041 => 114042)
--- trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h 2012-04-12 22:28:03 UTC (rev 114042)
@@ -220,7 +220,7 @@
#if USE(V8)
// A frame's V8 context was created or destroyed.
- virtual void didCreateScriptContext(v8::Handle<v8::Context>, int);
+ virtual void didCreateScriptContext(v8::Handle<v8::Context>, int, int);
virtual void willReleaseScriptContext(v8::Handle<v8::Context>, int);
// A context untied to a frame was created (through evaluateInIsolatedWorld).
@@ -230,7 +230,7 @@
// Returns true if we should allow the given V8 extension to be added to
// the script context at the currently loading page and given extension group.
- virtual bool allowScriptExtension(const String& extensionName, int extensionGroup) { return false; }
+ virtual bool allowScriptExtension(const String& extensionName, int extensionGroup, int worldID) { return false; }
#endif
virtual void registerForIconNotification(bool);
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp (114041 => 114042)
--- trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp 2012-04-12 22:28:03 UTC (rev 114042)
@@ -42,10 +42,9 @@
#endif
#include "qwebelement_p.h"
+#include <_javascript_Core/runtime/InitializeThreading.h>
#include <QApplication>
#include <QStyle>
-
-#include <runtime/InitializeThreading.h>
#include <wtf/MainThread.h>
namespace WebKit {
Modified: trunk/Source/WebKit/qt/declarative/declarative.pro (114041 => 114042)
--- trunk/Source/WebKit/qt/declarative/declarative.pro 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Source/WebKit/qt/declarative/declarative.pro 2012-04-12 22:28:03 UTC (rev 114042)
@@ -7,6 +7,8 @@
TEMPLATE = subdirs
CONFIG += ordered
+load(features)
+
public_api.file = public.pri
public_api.makefile = Makefile.declarative.public
SUBDIRS += public_api
Modified: trunk/Tools/ChangeLog (114041 => 114042)
--- trunk/Tools/ChangeLog 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Tools/ChangeLog 2012-04-12 22:28:03 UTC (rev 114042)
@@ -1,3 +1,15 @@
+2012-04-12 Balazs Kelemen <[email protected]>
+
+ [Qt] Fix WebKit1 build with V8
+ https://bugs.webkit.org/show_bug.cgi?id=83322
+
+ Reviewed by Adam Barth.
+
+ * DumpRenderTree/qt/DumpRenderTree.pro:
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/features/default_pre.prf:
+ * qmake/mkspecs/features/features.prf:
+
2012-04-12 Dirk Pranke <[email protected]>
test-webkitpy fails on metered_stream_unittest for non-US West Coast Time Zones
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (114041 => 114042)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-04-12 22:28:03 UTC (rev 114042)
@@ -11,7 +11,8 @@
load(features)
-WEBKIT += wtf _javascript_core webcore
+WEBKIT += wtf webcore
+!v8: WEBKIT += _javascript_core
INCLUDEPATH += \
$$PWD/.. \
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (114041 => 114042)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-04-12 22:28:03 UTC (rev 114042)
@@ -5,6 +5,8 @@
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
+load(features)
+
# Flag that we're now done processing the project file. This allows
# a feature to distinguish between being processed due to a load()
# or include() and a CONFIG += feature.
@@ -48,8 +50,11 @@
-Winit-self \
$$QMAKE_CXXFLAGS
-contains(_javascript_CORE_JIT, yes): DEFINES+=ENABLE_JIT=1
-contains(_javascript_CORE_JIT, no): DEFINES+=ENABLE_JIT=0
+v8: DEFINES += WTF_USE_V8=1
+else {
+ contains(_javascript_CORE_JIT, yes): DEFINES+=ENABLE_JIT=1
+ contains(_javascript_CORE_JIT, no): DEFINES+=ENABLE_JIT=0
+}
# Template configurations
contains(TEMPLATE, derived) {
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (114041 => 114042)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-04-12 22:28:03 UTC (rev 114042)
@@ -279,6 +279,13 @@
contains(DEFINES, ENABLE_REQUEST_ANIMATION_FRAME=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_REQUEST_ANIMATION_FRAME=1
contains(DEFINES, ENABLE_TOUCH_ADJUSTMENT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TOUCH_ADJUSTMENT=1
+v8 {
+ # This have to be placed here because command line arguments, such as CONFIG+=v8 are
+ # not considered by qmake when processing defaults_pre.prf.
+ root_project_file: message("Building WebKit2 with v8 is not supported currently. Disabling WebKit2.")
+ CONFIG += no_webkit2
+}
+
# Used to compute defaults for the build-webkit script
# Don't place anything after this!
CONFIG(compute_defaults) {
Modified: trunk/WebKit.pro (114041 => 114042)
--- trunk/WebKit.pro 2012-04-12 22:19:15 UTC (rev 114041)
+++ trunk/WebKit.pro 2012-04-12 22:28:03 UTC (rev 114042)
@@ -8,6 +8,8 @@
TEMPLATE = subdirs
CONFIG += ordered
+load(features)
+
QMAKEPATH = $$(QMAKEPATH)
isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
