Diff
Modified: trunk/ChangeLog (104824 => 104825)
--- trunk/ChangeLog 2012-01-12 14:57:26 UTC (rev 104824)
+++ trunk/ChangeLog 2012-01-12 15:14:56 UTC (rev 104825)
@@ -1,3 +1,12 @@
+2012-01-12 Simon Hausmann <[email protected]>
+
+ Make the new WTF module build on Qt
+ https://bugs.webkit.org/show_bug.cgi?id=76163
+
+ Reviewed by Tor Arne Vestbø.
+
+ * WebKit.pro: Build the new WTF instead of the old one.
+
2012-01-12 Shinya Kawanaka <[email protected]>
ShadowContentElement should be able to use query.
Modified: trunk/Source/_javascript_Core/ChangeLog (104824 => 104825)
--- trunk/Source/_javascript_Core/ChangeLog 2012-01-12 14:57:26 UTC (rev 104824)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-01-12 15:14:56 UTC (rev 104825)
@@ -1,3 +1,12 @@
+2012-01-12 Simon Hausmann <[email protected]>
+
+ Make the new WTF module build on Qt
+ https://bugs.webkit.org/show_bug.cgi?id=76163
+
+ Reviewed by Tor Arne Vestbø.
+
+ * _javascript_Core.pro: Removed wtf from the subdirs to build.
+
2012-01-11 Filip Pizlo <[email protected]>
CodeBlock::m_executeCounter should be renamed to CodeBlock::m_jitExecuteCounter
Modified: trunk/Source/_javascript_Core/_javascript_Core.pro (104824 => 104825)
--- trunk/Source/_javascript_Core/_javascript_Core.pro 2012-01-12 14:57:26 UTC (rev 104824)
+++ trunk/Source/_javascript_Core/_javascript_Core.pro 2012-01-12 15:14:56 UTC (rev 104825)
@@ -7,19 +7,13 @@
TEMPLATE = subdirs
CONFIG += ordered
-WTF.file = wtf/wtf.pro
-WTF.makefile = Makefile.WTF
-SUBDIRS += WTF
+derived_sources.file = DerivedSources.pri
+target.file = Target.pri
-!v8 {
- derived_sources.file = DerivedSources.pri
- target.file = Target.pri
+SUBDIRS += derived_sources target
- SUBDIRS += derived_sources target
+addStrictSubdirOrderBetween(derived_sources, target)
- addStrictSubdirOrderBetween(derived_sources, target)
-
- jsc.file = jsc.pro
- jsc.makefile = Makefile.jsc
- SUBDIRS += jsc
-}
+jsc.file = jsc.pro
+jsc.makefile = Makefile.jsc
+SUBDIRS += jsc
Deleted: trunk/Source/_javascript_Core/wtf/wtf.pri (104824 => 104825)
--- trunk/Source/_javascript_Core/wtf/wtf.pri 2012-01-12 14:57:26 UTC (rev 104824)
+++ trunk/Source/_javascript_Core/wtf/wtf.pri 2012-01-12 15:14:56 UTC (rev 104825)
@@ -1,42 +0,0 @@
-# -------------------------------------------------------------------
-# This file contains shared rules used both when building WTF itself
-# and for targets that depend in some way on WTF.
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-load(features)
-
-SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/_javascript_Core/wtf
-
-INCLUDEPATH += \
- $$SOURCE_DIR/.. \
- $$SOURCE_DIR \
- $$SOURCE_DIR/gobject \
- $$SOURCE_DIR/qt \
- $$SOURCE_DIR/unicode
-
-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
-}
-
-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
- PKGCONFIG += glib-2.0 gio-2.0
- }
-}
-
-win32-*: LIBS += -lwinmm
Deleted: trunk/Source/_javascript_Core/wtf/wtf.pro (104824 => 104825)
--- trunk/Source/_javascript_Core/wtf/wtf.pro 2012-01-12 14:57:26 UTC (rev 104824)
+++ trunk/Source/_javascript_Core/wtf/wtf.pro 2012-01-12 15:14:56 UTC (rev 104825)
@@ -1,252 +0,0 @@
-# -------------------------------------------------------------------
-# Project file for WTF
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-TEMPLATE = lib
-TARGET = WTF
-
-include(wtf.pri)
-
-CONFIG += staticlib
-
-QT += core
-QT -= gui
-
-*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
-*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
-
-HEADERS += \
- Alignment.h \
- AlwaysInline.h \
- ArrayBuffer.h \
- ArrayBufferView.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.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/strtod.h \
- dtoa/utils.h \
- DynamicAnnotations.h \
- Encoder.h \
- FastAllocBase.h \
- FastMalloc.h \
- FixedArray.h \
- Float32Array.h \
- Float64Array.h \
- Forward.h \
- Functional.h \
- GetPtr.h \
- HashCountedSet.h \
- HashFunctions.h \
- HashIterators.h \
- HashMap.h \
- HashSet.h \
- HashTable.h \
- HashTraits.h \
- HexNumber.h \
- Int16Array.h \
- Int32Array.h \
- Int8Array.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 \
- OwnPtr.h \
- OwnPtrCommon.h \
- PackedIntVector.h \
- PageAllocation.h \
- PageAllocationAligned.h \
- PageBlock.h \
- PageReservation.h \
- ParallelJobs.h \
- ParallelJobsGeneric.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/ASCIIFastPath.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 \
- Uint16Array.h \
- Uint32Array.h \
- Uint8Array.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
-
-
-unix: HEADERS += ThreadIdentifierDataPthreads.h
-
-SOURCES += \
- ArrayBuffer.cpp \
- ArrayBufferView.cpp \
- 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 \
- 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 \
- ThreadIdentifierDataPthreads.cpp \
- ThreadingPthreads.cpp
-
-win*|wince*: SOURCES += \
- OSAllocatorWin.cpp \
- ThreadSpecificWin.cpp \
- ThreadingWin.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/WTF/ChangeLog (104824 => 104825)
--- trunk/Source/WTF/ChangeLog 2012-01-12 14:57:26 UTC (rev 104824)
+++ trunk/Source/WTF/ChangeLog 2012-01-12 15:14:56 UTC (rev 104825)
@@ -1,3 +1,17 @@
+2012-01-12 Simon Hausmann <[email protected]>
+
+ Make the new WTF module build on Qt
+ https://bugs.webkit.org/show_bug.cgi?id=76163
+
+ Reviewed by Tor Arne Vestbø.
+
+ With this change the WTF sources are built _here_ but _from_ their old location using a VPATH.
+
+ * WTF.pri: Renamed from Source/_javascript_Core/wtf/wtf.pri.
+ * WTF.pro: Renamed from Source/_javascript_Core/wtf/wtf.pro.
+ * config.h: Bring this file in sync with _javascript_Core/config.h with regards to the inclusion
+ / definition of the export macros.
+
2012-01-06 Benjamin Poulain <[email protected]>
[Mac] Sort the resources of WTF.xcodeproj
Copied: trunk/Source/WTF/WTF.pri (from rev 104824, trunk/Source/_javascript_Core/wtf/wtf.pri) (0 => 104825)
--- trunk/Source/WTF/WTF.pri (rev 0)
+++ trunk/Source/WTF/WTF.pri 2012-01-12 15:14:56 UTC (rev 104825)
@@ -0,0 +1,43 @@
+# -------------------------------------------------------------------
+# This file contains shared rules used both when building WTF itself
+# and for targets that depend in some way on WTF.
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+load(features)
+
+SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WTF
+OLD_SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/_javascript_Core/wtf
+
+INCLUDEPATH += \
+ $$OLD_SOURCE_DIR/.. \
+ $$OLD_SOURCE_DIR \
+ $$OLD_SOURCE_DIR/gobject \
+ $$OLD_SOURCE_DIR/qt \
+ $$OLD_SOURCE_DIR/unicode
+
+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
+}
+
+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
+ PKGCONFIG += glib-2.0 gio-2.0
+ }
+}
+
+win32-*: LIBS += -lwinmm
Copied: trunk/Source/WTF/WTF.pro (from rev 104824, trunk/Source/_javascript_Core/wtf/wtf.pro) (0 => 104825)
--- trunk/Source/WTF/WTF.pro (rev 0)
+++ trunk/Source/WTF/WTF.pro 2012-01-12 15:14:56 UTC (rev 104825)
@@ -0,0 +1,254 @@
+# -------------------------------------------------------------------
+# Project file for WTF
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+TEMPLATE = lib
+TARGET = WTF
+
+include(WTF.pri)
+
+CONFIG += staticlib
+
+VPATH += $$PWD/../_javascript_Core/wtf
+
+HEADERS += \
+ Alignment.h \
+ AlwaysInline.h \
+ ArrayBuffer.h \
+ ArrayBufferView.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.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/strtod.h \
+ dtoa/utils.h \
+ DynamicAnnotations.h \
+ Encoder.h \
+ FastAllocBase.h \
+ FastMalloc.h \
+ FixedArray.h \
+ Float32Array.h \
+ Float64Array.h \
+ Forward.h \
+ Functional.h \
+ GetPtr.h \
+ HashCountedSet.h \
+ HashFunctions.h \
+ HashIterators.h \
+ HashMap.h \
+ HashSet.h \
+ HashTable.h \
+ HashTraits.h \
+ HexNumber.h \
+ Int16Array.h \
+ Int32Array.h \
+ Int8Array.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 \
+ OwnPtr.h \
+ OwnPtrCommon.h \
+ PackedIntVector.h \
+ PageAllocation.h \
+ PageAllocationAligned.h \
+ PageBlock.h \
+ PageReservation.h \
+ ParallelJobs.h \
+ ParallelJobsGeneric.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/ASCIIFastPath.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 \
+ Uint16Array.h \
+ Uint32Array.h \
+ Uint8Array.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
+
+unix: HEADERS += ThreadIdentifierDataPthreads.h
+
+SOURCES += \
+ ArrayBuffer.cpp \
+ ArrayBufferView.cpp \
+ 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 \
+ 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 \
+ ThreadIdentifierDataPthreads.cpp \
+ ThreadingPthreads.cpp
+
+win*|wince*: SOURCES += \
+ OSAllocatorWin.cpp \
+ ThreadSpecificWin.cpp \
+ ThreadingWin.cpp
+
+
+QT += core
+QT -= gui
+
+*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
+*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
+
+*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/WTF/config.h (104824 => 104825)
--- trunk/Source/WTF/config.h 2012-01-12 14:57:26 UTC (rev 104824)
+++ trunk/Source/WTF/config.h 2012-01-12 15:14:56 UTC (rev 104825)
@@ -28,25 +28,12 @@
#endif
#include <wtf/Platform.h>
-
-/* See note in wtf/Platform.h for more info on EXPORT_MACROS. */
-#if USE(EXPORT_MACROS)
-
#include <wtf/ExportMacros.h>
-
-#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
-#define WTF_EXPORT_PRIVATE WTF_EXPORT
-#else
-#define WTF_EXPORT_PRIVATE WTF_IMPORT
+// WTF cannot depend on JSC even if USE(JSC).
+#if USE(JSC) && !defined(BUILDING_WTF)
+#include "JSExportMacros.h"
#endif
-#else /* !USE(EXPORT_MACROS) */
-
-#define WTF_EXPORT_PRIVATE
-#define JS_EXPORT_PRIVATE
-
-#endif /* USE(EXPORT_MACROS) */
-
#if OS(WINDOWS)
#ifndef _WIN32_WINNT
Modified: trunk/Tools/ChangeLog (104824 => 104825)
--- trunk/Tools/ChangeLog 2012-01-12 14:57:26 UTC (rev 104824)
+++ trunk/Tools/ChangeLog 2012-01-12 15:14:56 UTC (rev 104825)
@@ -1,3 +1,12 @@
+2012-01-12 Simon Hausmann <[email protected]>
+
+ Make the new WTF module build on Qt
+ https://bugs.webkit.org/show_bug.cgi?id=76163
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/modules/wtf.prf: Pull in WTF from the new location.
+
2012-01-12 Vsevolod Vlasov <[email protected]>
Unreviewed, mac DumpRenderTree fix.
Modified: trunk/Tools/qmake/mkspecs/modules/wtf.prf (104824 => 104825)
--- trunk/Tools/qmake/mkspecs/modules/wtf.prf 2012-01-12 14:57:26 UTC (rev 104824)
+++ trunk/Tools/qmake/mkspecs/modules/wtf.prf 2012-01-12 15:14:56 UTC (rev 104825)
@@ -4,6 +4,6 @@
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
-WEBKIT.wtf.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/_javascript_Core/wtf
+WEBKIT.wtf.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/WTF
-include($${WEBKIT.wtf.root_source_dir}/wtf.pri)
+include($${WEBKIT.wtf.root_source_dir}/WTF.pri)
Modified: trunk/WebKit.pro (104824 => 104825)
--- trunk/WebKit.pro 2012-01-12 14:57:26 UTC (rev 104824)
+++ trunk/WebKit.pro 2012-01-12 15:14:56 UTC (rev 104825)
@@ -14,11 +14,16 @@
# Otherwise we won't pick up the feature prf files needed for the build
}
-# Always go into _javascript_Core to at least build WTF.
-_javascript_Core.file = Source/_javascript_Core/_javascript_Core.pro
-_javascript_Core.makefile = Makefile._javascript_Core
-SUBDIRS += _javascript_Core
+WTF.file = Source/WTF/WTF.pro
+WTF.makefile = Makefile.WTF
+SUBDIRS += WTF
+!v8 {
+ _javascript_Core.file = Source/_javascript_Core/_javascript_Core.pro
+ _javascript_Core.makefile = Makefile._javascript_Core
+ SUBDIRS += _javascript_Core
+}
+
WebCore.file = Source/WebCore/WebCore.pro
WebCore.makefile = Makefile.WebCore
SUBDIRS += WebCore
