Diff
Modified: trunk/ChangeLog (101246 => 101247)
--- trunk/ChangeLog 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/ChangeLog 2011-11-28 12:20:45 UTC (rev 101247)
@@ -1,3 +1,13 @@
+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
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Source/api.pri: Require wtf.
+ * WebKit.pro: Build WTF.
+
2011-11-17 Martin Robinson <[email protected]>
[GTK] Integrate build-gtkdoc into build-webkit and make
Modified: trunk/Source/_javascript_Core/ChangeLog (101246 => 101247)
--- trunk/Source/_javascript_Core/ChangeLog 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-11-28 12:20:45 UTC (rev 101247)
@@ -1,3 +1,16 @@
+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
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Target.pri: Don't claim to build WTF, as that would cause
+ the debug-with-shlibs build to not link in wtf.
+ * jsc.pro: Require wtf.
+ * wtf/wtf.pri: Removed.
+ * wtf/wtf.pro: Added. Pro file to build wtf statically.
+
2011-11-28 Martin Robinson <[email protected]>
[GTK] _javascript_Core generated sources should build in the DerivedSources directory
Modified: trunk/Source/_javascript_Core/Target.pri (101246 => 101247)
--- trunk/Source/_javascript_Core/Target.pri 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Source/_javascript_Core/Target.pri 2011-11-28 12:20:45 UTC (rev 101247)
@@ -6,9 +6,10 @@
TEMPLATE = lib
-DEFINES += BUILDING_JavaScriptCore BUILDING_WTF
+DEFINES += BUILDING_JavaScriptCore
load(_javascript_core)
+load(wtf)
CONFIG += javas
CONFIG += staticlib
@@ -36,7 +37,6 @@
}
include(yarr/yarr.pri)
-include(wtf/wtf.pri)
INSTALLDEPS += all
Modified: trunk/Source/_javascript_Core/jsc.pro (101246 => 101247)
--- trunk/Source/_javascript_Core/jsc.pro 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Source/_javascript_Core/jsc.pro 2011-11-28 12:20:45 UTC (rev 101247)
@@ -15,7 +15,7 @@
win32-msvc*: CONFIG += exceptions_off stl_off
win32-msvc*|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/_javascript_Core/os-win32
-CONFIG += _javascript_core
+CONFIG += _javascript_core wtf
SOURCES = jsc.cpp
Deleted: trunk/Source/_javascript_Core/wtf/wtf.pri (101246 => 101247)
--- trunk/Source/_javascript_Core/wtf/wtf.pri 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Source/_javascript_Core/wtf/wtf.pri 2011-11-28 12:20:45 UTC (rev 101247)
@@ -1,193 +0,0 @@
-# -------------------------------------------------------------------
-# Project file for WTF
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-HEADERS += \
- wtf/Alignment.h \
- wtf/AlwaysInline.h \
- wtf/ASCIICType.h \
- wtf/Assertions.h \
- wtf/Atomics.h \
- wtf/AVLTree.h \
- wtf/Bitmap.h \
- wtf/BitVector.h \
- wtf/BloomFilter.h \
- wtf/BoundsCheckedPointer.h \
- wtf/BumpPointerAllocator.h \
- wtf/ByteArray.h \
- wtf/CheckedArithmetic.h \
- wtf/Compiler.h \
- wtf/CryptographicallyRandomNumber.h \
- wtf/CurrentTime.h \
- wtf/DateMath.h \
- wtf/DecimalNumber.h \
- wtf/Decoder.h \
- wtf/Deque.h \
- wtf/DisallowCType.h \
- wtf/dtoa/bignum-dtoa.h \
- wtf/dtoa/bignum.h \
- wtf/dtoa/cached-powers.h \
- wtf/dtoa/diy-fp.h \
- wtf/dtoa/double-conversion.h \
- wtf/dtoa/double.h \
- wtf/dtoa/fast-dtoa.h \
- wtf/dtoa/fixed-dtoa.h \
- wtf/dtoa.h \
- wtf/dtoa/strtod.h \
- wtf/dtoa/utils.h \
- wtf/DynamicAnnotations.h \
- wtf/Encoder.h \
- wtf/FastAllocBase.h \
- wtf/FastMalloc.h \
- wtf/FixedArray.h \
- wtf/Forward.h \
- wtf/GetPtr.h \
- wtf/HashCountedSet.h \
- wtf/HashFunctions.h \
- wtf/HashIterators.h \
- wtf/HashMap.h \
- wtf/HashSet.h \
- wtf/HashTable.h \
- wtf/HashTraits.h \
- wtf/HexNumber.h \
- wtf/ListHashSet.h \
- wtf/ListRefPtr.h \
- wtf/Locker.h \
- wtf/MainThread.h \
- wtf/MallocZoneSupport.h \
- wtf/MathExtras.h \
- wtf/MD5.h \
- wtf/MessageQueue.h \
- wtf/MetaAllocator.h \
- wtf/MetaAllocatorHandle.h \
- wtf/Noncopyable.h \
- wtf/NonCopyingSort.h \
- wtf/NotFound.h \
- wtf/NullPtr.h \
- wtf/OSAllocator.h \
- wtf/OSRandomSource.h \
- wtf/OwnArrayPtr.h \
- wtf/OwnFastMallocPtr.h \
- wtf/OwnPtrCommon.h \
- wtf/OwnPtr.h \
- wtf/PackedIntVector.h \
- wtf/PageAllocationAligned.h \
- wtf/PageAllocation.h \
- wtf/PageBlock.h \
- wtf/PageReservation.h \
- wtf/ParallelJobsGeneric.h \
- wtf/ParallelJobs.h \
- wtf/ParallelJobsLibdispatch.h \
- wtf/ParallelJobsOpenMP.h \
- wtf/PassOwnArrayPtr.h \
- wtf/PassOwnPtr.h \
- wtf/PassRefPtr.h \
- wtf/PassTraits.h \
- wtf/Platform.h \
- wtf/PossiblyNull.h \
- wtf/qt/UtilsQt.h \
- wtf/RandomNumber.h \
- wtf/RandomNumberSeed.h \
- wtf/RedBlackTree.h \
- wtf/RefCounted.h \
- wtf/RefCountedLeakCounter.h \
- wtf/RefPtr.h \
- wtf/RefPtrHashMap.h \
- wtf/RetainPtr.h \
- wtf/SHA1.h \
- wtf/Spectrum.h \
- wtf/StackBounds.h \
- wtf/StaticConstructors.h \
- wtf/StdLibExtras.h \
- wtf/StringExtras.h \
- wtf/StringHasher.h \
- wtf/TCPackedCache.h \
- wtf/TCSpinLock.h \
- wtf/TCSystemAlloc.h \
- wtf/text/AtomicString.h \
- wtf/text/AtomicStringHash.h \
- wtf/text/AtomicStringImpl.h \
- wtf/text/CString.h \
- wtf/text/StringBuffer.h \
- wtf/text/StringBuilder.h \
- wtf/text/StringConcatenate.h \
- wtf/text/StringHash.h \
- wtf/text/StringImpl.h \
- wtf/text/StringOperators.h \
- wtf/text/TextPosition.h \
- wtf/text/WTFString.h \
- wtf/Threading.h \
- wtf/ThreadingPrimitives.h \
- wtf/ThreadRestrictionVerifier.h \
- wtf/ThreadSafeRefCounted.h \
- wtf/ThreadSpecific.h \
- wtf/TypeTraits.h \
- wtf/unicode/CharacterNames.h \
- wtf/unicode/Collator.h \
- wtf/unicode/icu/UnicodeIcu.h \
- wtf/unicode/qt4/UnicodeQt4.h \
- wtf/unicode/ScriptCodesFromICU.h \
- wtf/unicode/Unicode.h \
- wtf/unicode/UnicodeMacrosFromICU.h \
- wtf/unicode/UTF8.h \
- wtf/UnusedParam.h \
- wtf/ValueCheck.h \
- wtf/Vector.h \
- wtf/VectorTraits.h \
- wtf/VMTags.h \
- wtf/WTFThreadData.h
-
-SOURCES += \
- wtf/Assertions.cpp \
- wtf/BitVector.cpp \
- wtf/ByteArray.cpp \
- wtf/CryptographicallyRandomNumber.cpp \
- wtf/CurrentTime.cpp \
- wtf/DateMath.cpp \
- wtf/DecimalNumber.cpp \
- wtf/dtoa.cpp \
- wtf/dtoa/bignum-dtoa.cc \
- wtf/dtoa/bignum.cc \
- wtf/dtoa/cached-powers.cc \
- wtf/dtoa/diy-fp.cc \
- wtf/dtoa/double-conversion.cc \
- wtf/dtoa/fast-dtoa.cc \
- wtf/dtoa/fixed-dtoa.cc \
- wtf/dtoa/strtod.cc \
- wtf/FastMalloc.cpp \
- wtf/gobject/GOwnPtr.cpp \
- wtf/gobject/GRefPtr.cpp \
- wtf/HashTable.cpp \
- wtf/MD5.cpp \
- wtf/MainThread.cpp \
- wtf/MetaAllocator.cpp \
- wtf/NullPtr.cpp \
- wtf/OSRandomSource.cpp \
- wtf/qt/MainThreadQt.cpp \
- wtf/qt/StringQt.cpp \
- wtf/qt/ThreadingQt.cpp \
- wtf/PageAllocationAligned.cpp \
- wtf/PageBlock.cpp \
- wtf/ParallelJobsGeneric.cpp \
- wtf/RandomNumber.cpp \
- wtf/RefCountedLeakCounter.cpp \
- wtf/SHA1.cpp \
- wtf/StackBounds.cpp \
- wtf/TCSystemAlloc.cpp \
- wtf/Threading.cpp \
- wtf/TypeTraits.cpp \
- wtf/WTFThreadData.cpp \
- wtf/text/AtomicString.cpp \
- wtf/text/CString.cpp \
- wtf/text/StringBuilder.cpp \
- wtf/text/StringImpl.cpp \
- wtf/text/StringStatics.cpp \
- wtf/text/WTFString.cpp \
- wtf/unicode/CollatorDefault.cpp \
- wtf/unicode/icu/CollatorICU.cpp \
- wtf/unicode/UTF8.cpp
-
-unix: SOURCES += wtf/OSAllocatorPosix.cpp
-win*|wince*: SOURCES += wtf/OSAllocatorWin.cpp
Added: trunk/Source/_javascript_Core/wtf/wtf.pro (0 => 101247)
--- trunk/Source/_javascript_Core/wtf/wtf.pro (rev 0)
+++ trunk/Source/_javascript_Core/wtf/wtf.pro 2011-11-28 12:20:45 UTC (rev 101247)
@@ -0,0 +1,235 @@
+# -------------------------------------------------------------------
+# Project file for WTF
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+TEMPLATE = lib
+
+DEFINES += BUILDING_WTF
+
+load(wtf)
+
+
+CONFIG += staticlib
+# Don't use WTF as the target name. qmake would create a
+# WTF.vcproj for msvc which already exists as a directory
+TARGET = $$WTF_TARGET
+DESTDIR = $$WTF_DESTDIR
+QT += core
+QT -= gui
+
+*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
+*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
+
+HEADERS += \
+ Alignment.h \
+ AlwaysInline.h \
+ ASCIICType.h \
+ Assertions.h \
+ Atomics.h \
+ AVLTree.h \
+ Bitmap.h \
+ BitVector.h \
+ BloomFilter.h \
+ BoundsCheckedPointer.h \
+ BumpPointerAllocator.h \
+ ByteArray.h \
+ CheckedArithmetic.h \
+ Compiler.h \
+ CryptographicallyRandomNumber.h \
+ CurrentTime.h \
+ DateMath.h \
+ DecimalNumber.h \
+ Decoder.h \
+ Deque.h \
+ DisallowCType.h \
+ dtoa/bignum-dtoa.h \
+ dtoa/bignum.h \
+ dtoa/cached-powers.h \
+ dtoa/diy-fp.h \
+ dtoa/double-conversion.h \
+ dtoa/double.h \
+ dtoa/fast-dtoa.h \
+ dtoa/fixed-dtoa.h \
+ dtoa.h \
+ dtoa/strtod.h \
+ dtoa/utils.h \
+ DynamicAnnotations.h \
+ Encoder.h \
+ FastAllocBase.h \
+ FastMalloc.h \
+ FixedArray.h \
+ Forward.h \
+ GetPtr.h \
+ HashCountedSet.h \
+ HashFunctions.h \
+ HashIterators.h \
+ HashMap.h \
+ HashSet.h \
+ HashTable.h \
+ HashTraits.h \
+ HexNumber.h \
+ ListHashSet.h \
+ ListRefPtr.h \
+ Locker.h \
+ MainThread.h \
+ MallocZoneSupport.h \
+ MathExtras.h \
+ MD5.h \
+ MessageQueue.h \
+ MetaAllocator.h \
+ MetaAllocatorHandle.h \
+ Noncopyable.h \
+ NonCopyingSort.h \
+ NotFound.h \
+ NullPtr.h \
+ OSAllocator.h \
+ OSRandomSource.h \
+ OwnArrayPtr.h \
+ OwnFastMallocPtr.h \
+ OwnPtrCommon.h \
+ OwnPtr.h \
+ PackedIntVector.h \
+ PageAllocationAligned.h \
+ PageAllocation.h \
+ PageBlock.h \
+ PageReservation.h \
+ ParallelJobsGeneric.h \
+ ParallelJobs.h \
+ ParallelJobsLibdispatch.h \
+ ParallelJobsOpenMP.h \
+ PassOwnArrayPtr.h \
+ PassOwnPtr.h \
+ PassRefPtr.h \
+ PassTraits.h \
+ Platform.h \
+ PossiblyNull.h \
+ qt/UtilsQt.h \
+ RandomNumber.h \
+ RandomNumberSeed.h \
+ RedBlackTree.h \
+ RefCounted.h \
+ RefCountedLeakCounter.h \
+ RefPtr.h \
+ RefPtrHashMap.h \
+ RetainPtr.h \
+ SHA1.h \
+ Spectrum.h \
+ StackBounds.h \
+ StaticConstructors.h \
+ StdLibExtras.h \
+ StringExtras.h \
+ StringHasher.h \
+ TCPackedCache.h \
+ TCSpinLock.h \
+ TCSystemAlloc.h \
+ text/AtomicString.h \
+ text/AtomicStringHash.h \
+ text/AtomicStringImpl.h \
+ text/CString.h \
+ text/StringBuffer.h \
+ text/StringBuilder.h \
+ text/StringConcatenate.h \
+ text/StringHash.h \
+ text/StringImpl.h \
+ text/StringOperators.h \
+ text/TextPosition.h \
+ text/WTFString.h \
+ Threading.h \
+ ThreadingPrimitives.h \
+ ThreadRestrictionVerifier.h \
+ ThreadSafeRefCounted.h \
+ ThreadSpecific.h \
+ TypeTraits.h \
+ unicode/CharacterNames.h \
+ unicode/Collator.h \
+ unicode/icu/UnicodeIcu.h \
+ unicode/qt4/UnicodeQt4.h \
+ unicode/ScriptCodesFromICU.h \
+ unicode/Unicode.h \
+ unicode/UnicodeMacrosFromICU.h \
+ unicode/UTF8.h \
+ UnusedParam.h \
+ ValueCheck.h \
+ Vector.h \
+ VectorTraits.h \
+ VMTags.h \
+ WTFThreadData.h
+
+SOURCES += \
+ Assertions.cpp \
+ BitVector.cpp \
+ ByteArray.cpp \
+ CryptographicallyRandomNumber.cpp \
+ CurrentTime.cpp \
+ DateMath.cpp \
+ DecimalNumber.cpp \
+ dtoa.cpp \
+ dtoa/bignum-dtoa.cc \
+ dtoa/bignum.cc \
+ dtoa/cached-powers.cc \
+ dtoa/diy-fp.cc \
+ dtoa/double-conversion.cc \
+ dtoa/fast-dtoa.cc \
+ dtoa/fixed-dtoa.cc \
+ dtoa/strtod.cc \
+ FastMalloc.cpp \
+ gobject/GOwnPtr.cpp \
+ gobject/GRefPtr.cpp \
+ HashTable.cpp \
+ MD5.cpp \
+ MainThread.cpp \
+ MetaAllocator.cpp \
+ NullPtr.cpp \
+ OSRandomSource.cpp \
+ qt/MainThreadQt.cpp \
+ qt/StringQt.cpp \
+ qt/ThreadingQt.cpp \
+ PageAllocationAligned.cpp \
+ PageBlock.cpp \
+ ParallelJobsGeneric.cpp \
+ RandomNumber.cpp \
+ RefCountedLeakCounter.cpp \
+ SHA1.cpp \
+ StackBounds.cpp \
+ TCSystemAlloc.cpp \
+ Threading.cpp \
+ TypeTraits.cpp \
+ WTFThreadData.cpp \
+ text/AtomicString.cpp \
+ text/CString.cpp \
+ text/StringBuilder.cpp \
+ text/StringImpl.cpp \
+ text/StringStatics.cpp \
+ text/WTFString.cpp \
+ unicode/CollatorDefault.cpp \
+ unicode/icu/CollatorICU.cpp \
+ unicode/UTF8.cpp
+
+unix: SOURCES += OSAllocatorPosix.cpp
+win*|wince*: SOURCES += OSAllocatorWin.cpp
+
+*sh4* {
+ QMAKE_CXXFLAGS += -mieee -w
+ QMAKE_CFLAGS += -mieee -w
+}
+
+lessThan(QT_GCC_MAJOR_VERSION, 5) {
+ # GCC 4.5 and before
+ lessThan(QT_GCC_MINOR_VERSION, 6) {
+ # Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec.
+ *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
+ }
+
+ # GCC 4.6 and after.
+ greaterThan(QT_GCC_MINOR_VERSION, 5) {
+ if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
+ # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
+ QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat
+ QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
+ QMAKE_CFLAGS += -Wno-c++0x-compat
+ QMAKE_CXXFLAGS += -Wno-c++0x-compat
+ }
+ }
+}
Modified: trunk/Source/WebCore/ChangeLog (101246 => 101247)
--- trunk/Source/WebCore/ChangeLog 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Source/WebCore/ChangeLog 2011-11-28 12:20:45 UTC (rev 101247)
@@ -1,3 +1,14 @@
+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
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Target.pri: Require wtf and don't claim to be building it
+ with BUILDING_WTF in DEFINES (otherwise we won't link it with
+ debug-shlib builds).
+
2011-11-28 Taiju TSUIKI <[email protected]>
Fix build error on Chromium/Windows.
Modified: trunk/Source/WebCore/Target.pri (101246 => 101247)
--- trunk/Source/WebCore/Target.pri 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Source/WebCore/Target.pri 2011-11-28 12:20:45 UTC (rev 101247)
@@ -6,10 +6,11 @@
TEMPLATE = lib
-DEFINES += BUILDING_WebCore BUILDING_WTF
+DEFINES += BUILDING_WebCore
load(webcore)
load(_javascript_core)
+load(wtf)
CONFIG += staticlib
Modified: trunk/Source/WebKit2/ChangeLog (101246 => 101247)
--- trunk/Source/WebKit2/ChangeLog 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-28 12:20:45 UTC (rev 101247)
@@ -1,3 +1,14 @@
+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
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Target.pri: Require wtf.
+ * UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp: Remove unnecessary config.h
+ inclusion and thus wtf dependency.
+
2011-11-28 Pavel Feldman <[email protected]>
REGRESSION (r101201): Crash inside WebKit::WebInspector::didClose() when closing any tab
Modified: trunk/Source/WebKit2/Target.pri (101246 => 101247)
--- trunk/Source/WebKit2/Target.pri 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Source/WebKit2/Target.pri 2011-11-28 12:20:45 UTC (rev 101247)
@@ -8,6 +8,7 @@
DEFINES += BUILDING_WebKit2
+load(wtf)
load(_javascript_core)
load(webcore)
load(webkit2)
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp (101246 => 101247)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp 2011-11-28 12:20:45 UTC (rev 101247)
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-#include "config.h"
#include "../util.h"
#include <QVarLengthArray>
Modified: trunk/Source/api.pri (101246 => 101247)
--- trunk/Source/api.pri 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Source/api.pri 2011-11-28 12:20:45 UTC (rev 101247)
@@ -15,6 +15,8 @@
include(WebKit/WebKit.pri)
+CONFIG += wtf
+
!v8:CONFIG += _javascript_core
CONFIG += webcore
Modified: trunk/Tools/ChangeLog (101246 => 101247)
--- trunk/Tools/ChangeLog 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Tools/ChangeLog 2011-11-28 12:20:45 UTC (rev 101247)
@@ -1,3 +1,23 @@
+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
+
+ Reviewed by Tor Arne Vestbø.
+
+ * DumpRenderTree/qt/DumpRenderTree.pro: Require wtf.
+ * MiniBrowser/qt/BrowserWindow.cpp: Remove unnecessary config.h inclusion and
+ thus wtf dependency.
+ * WebKitTestRunner/InjectedBundle/Target.pri: Require wtf.
+ * WebKitTestRunner/Target.pri: Ditto.
+ * qmake/mkspecs/features/default_post.prf: When re-ordering the static libs
+ consider wtf, too.
+ * qmake/mkspecs/features/_javascript_core.prf: Remove WTF specific build stuff,
+ moved into wtf.prf.
+ * qmake/mkspecs/features/qtwebkit.prf: For debug builds with shared libs, also
+ link in libwtf.
+ * qmake/mkspecs/features/wtf.prf: Added. Stuff needed for building and using WTF.
+
2011-11-28 Kentaro Hara <[email protected]>
run-bindings-tests shows diff error for a newly added binding test
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (101246 => 101247)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2011-11-28 12:20:45 UTC (rev 101247)
@@ -11,6 +11,7 @@
CONFIG += uitools
+load(wtf)
load(_javascript_core)
load(webcore)
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp (101246 => 101247)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-11-28 12:20:45 UTC (rev 101247)
@@ -28,7 +28,6 @@
#include "BrowserWindow.h"
-#include "config.h"
#include "qquickwebpage_p.h"
#include "qquickwebview_p.h"
#include "utils.h"
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (101246 => 101247)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-11-28 12:20:45 UTC (rev 101247)
@@ -53,6 +53,7 @@
QT += declarative widgets
load(features)
+load(wtf)
load(_javascript_core)
load(webcore)
Modified: trunk/Tools/WebKitTestRunner/Target.pri (101246 => 101247)
--- trunk/Tools/WebKitTestRunner/Target.pri 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Tools/WebKitTestRunner/Target.pri 2011-11-28 12:20:45 UTC (rev 101247)
@@ -28,6 +28,7 @@
QT = core gui widgets network declarative testlib
load(features)
+load(wtf)
load(_javascript_core)
load(webkit2)
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (101246 => 101247)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-28 12:20:45 UTC (rev 101247)
@@ -11,7 +11,7 @@
CONFIG += config_step
# Reorder CONFIG so that the link and include order is correct
-libraries = webkit2 webcore _javascript_core
+libraries = webkit2 webcore _javascript_core wtf
for(library, libraries) {
contains(CONFIG, $$library) {
CONFIG -= $$library
Modified: trunk/Tools/qmake/mkspecs/features/_javascript_core.prf (101246 => 101247)
--- trunk/Tools/qmake/mkspecs/features/_javascript_core.prf 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Tools/qmake/mkspecs/features/_javascript_core.prf 2011-11-28 12:20:45 UTC (rev 101247)
@@ -32,10 +32,6 @@
$$_javascript_CORE_SOURCE_DIR/parser \
$$_javascript_CORE_SOURCE_DIR/profiler \
$$_javascript_CORE_SOURCE_DIR/runtime \
- $$_javascript_CORE_SOURCE_DIR/wtf \
- $$_javascript_CORE_SOURCE_DIR/wtf/gobject \
- $$_javascript_CORE_SOURCE_DIR/wtf/qt \
- $$_javascript_CORE_SOURCE_DIR/wtf/unicode \
$$_javascript_CORE_SOURCE_DIR/yarr \
$$_javascript_CORE_SOURCE_DIR/API \
$$_javascript_CORE_SOURCE_DIR/ForwardingHeaders \
@@ -53,27 +49,11 @@
win32-*: DEFINES += _HAS_TR1=0
-contains(CONFIG, use_system_icu) {
- DEFINES += WTF_USE_ICU_UNICODE=1
- DEFINES -= WTF_USE_QT4_UNICODE
- LIBS += -licuuc -licui18n
-} else {
- DEFINES += WTF_USE_QT4_UNICODE=1
- DEFINES -= WTF_USE_ICU_UNICODE
-}
-
wince* {
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
INCLUDEPATH += $$_javascript_CORE_SOURCE_DIR/os-win32
}
-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
- PKGCONFIG += glib-2.0 gio-2.0
- }
-}
-
needToLinkLibrary(_javascript_Core) {
pathToJavaScriptCoreOutput = $${ROOT_BUILD_DIR}/Source/_javascript_Core/$$_javascript_CORE_DESTDIR
linkLibrary($$pathToJavaScriptCoreOutput, $$_javascript_CORE_TARGET)
@@ -83,4 +63,3 @@
}
}
-
Modified: trunk/Tools/qmake/mkspecs/features/qtwebkit.prf (101246 => 101247)
--- trunk/Tools/qmake/mkspecs/features/qtwebkit.prf 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/Tools/qmake/mkspecs/features/qtwebkit.prf 2011-11-28 12:20:45 UTC (rev 101247)
@@ -27,7 +27,7 @@
INCLUDEPATH += $${ROOT_BUILD_DIR}/include/QtWebKit
force_static_libs_as_shared {
- LIBS += -lwebkit2 -lwebcore -ljscore
+ LIBS += -lwebkit2 -lwebcore -ljscore -lwtf
}
}
Added: trunk/Tools/qmake/mkspecs/features/wtf.prf (0 => 101247)
--- trunk/Tools/qmake/mkspecs/features/wtf.prf (rev 0)
+++ trunk/Tools/qmake/mkspecs/features/wtf.prf 2011-11-28 12:20:45 UTC (rev 101247)
@@ -0,0 +1,50 @@
+# -------------------------------------------------------------------
+# This file contains shared rules used both when building against WTF
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+load(features)
+
+WTF_SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/_javascript_Core/wtf
+
+# Use a config-specific target to prevent parallel builds file clashes on Mac
+mac: CONFIG(debug, debug|release): WTF_TARGET = wtfd
+else: WTF_TARGET = wtf
+
+# Output in WTF/<config>
+CONFIG(debug, debug|release) : WTF_DESTDIR = debug
+else: WTF_DESTDIR = release
+
+WTF_INCLUDEPATH = \
+ $$WTF_SOURCE_DIR/.. \
+ $$WTF_SOURCE_DIR \
+ $$WTF_SOURCE_DIR/gobject \
+ $$WTF_SOURCE_DIR/qt \
+ $$WTF_SOURCE_DIR/unicode
+
+INCLUDEPATH = $$WTF_INCLUDEPATH $$INCLUDEPATH
+
+VPATH += $$WTF_SOURCE_DIR
+
+contains(CONFIG, use_system_icu) {
+ DEFINES += WTF_USE_ICU_UNICODE=1
+ DEFINES -= WTF_USE_QT4_UNICODE
+ LIBS += -licuuc -licui18n
+} else {
+ DEFINES += WTF_USE_QT4_UNICODE=1
+ DEFINES -= WTF_USE_ICU_UNICODE
+}
+
+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
+ PKGCONFIG += glib-2.0 gio-2.0
+ }
+}
+
+needToLinkLibrary(WTF) {
+ pathToWTFOutput = $${ROOT_BUILD_DIR}/Source/_javascript_Core/wtf/$$WTF_DESTDIR
+ linkLibrary($$pathToWTFOutput, $$WTF_TARGET)
+}
+
Modified: trunk/WebKit.pro (101246 => 101247)
--- trunk/WebKit.pro 2011-11-28 12:18:23 UTC (rev 101246)
+++ trunk/WebKit.pro 2011-11-28 12:20:45 UTC (rev 101247)
@@ -14,6 +14,10 @@
# Otherwise we won't pick up the feature prf files needed for the build
}
+WTF.file = Source/_javascript_Core/wtf/wtf.pro
+WTF.makefile = Makefile.WTF
+SUBDIRS += WTF
+
!CONFIG(v8) {
_javascript_Core.file = Source/_javascript_Core/_javascript_Core.pro
_javascript_Core.makefile = Makefile._javascript_Core
