Actually move WTF files to their new home

https://bugs.webkit.org/show_bug.cgi?id=81844

[Qt] Unreviewed buildfix after r111778.

.:

* Source/api.pri:

Source/WebCore:

* Target.pri:

Source/WTF:

* WTF.pri:

Tools:

* DumpRenderTree/qt/DumpRenderTree.pro:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111780 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 704915aea14c26400a903563405c7df839f13b0e..385b2ddf8a2de1d21403646b3c0d0952da75d8bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-22  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Actually move WTF files to their new home
+        https://bugs.webkit.org/show_bug.cgi?id=81844
+
+        [Qt] Unreviewed buildfix after r111778.
+
+        * Source/api.pri:
+
 2012-03-22  Ming Xie  <mxie@rim.com>
 
         OLD_COMPILE_FLAGS was set incorrectly in WebKitHelpers.cmake

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 2c939e775ac353038f8a8161034637f4cdf35269..d6c1de383932dffce70aa91833e89f7eb340075c 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-22  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Actually move WTF files to their new home
+        https://bugs.webkit.org/show_bug.cgi?id=81844
+
+        [Qt] Unreviewed buildfix after r111778.
+
+        * WTF.pri:
+
 2012-03-22  Eric Seidel  <eric@webkit.org>
 
         Actually move WTF files to their new home

diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri
index b32dc7fdd9d5eaa3a096d6a98cbfb514ad3a23e0..fed666a07550103bfb5506d2beabad2d411ec379 100644 (file)
--- a/Source/WTF/WTF.pri
+++ b/Source/WTF/WTF.pri
@@ -16,7 +16,8 @@ INCLUDEPATH += \
     $$SOURCE_DIR \
     $$SOURCE_DIR/gobject \
     $$SOURCE_DIR/qt \
-    $$SOURCE_DIR/unicode
+    $$SOURCE_DIR/unicode \
+    $$SOURCE_DIR/wtf
 
 haveQt(5) {
     mac {

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f4d4e322bbcf7bc3ff5385e3e539b62442089121..cbbe9cc54cafeb1050a4fcb605d507556976a446 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-22  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Actually move WTF files to their new home
+        https://bugs.webkit.org/show_bug.cgi?id=81844
+
+        [Qt] Unreviewed buildfix after r111778.
+
+        * Target.pri:
+
 2012-03-22  Kentaro Hara  <haraken@chromium.org>
 
         run-bindings-tests output a lot of errors in TestSerializedScriptValueInterface.idl

diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
index b46301eddc6530aaf40a14300c8b776f6acecff3..c7f1012088eab8f3dec151a1fff99b32e6bc0928 100644 (file)
--- a/Source/WebCore/Target.pri
+++ b/Source/WebCore/Target.pri
@@ -21,7 +21,7 @@ haveQt(5) {
     # path for QtScript when it's built as a standalone module
     QT += script
 } else {
-    INCLUDEPATH += $$PWD/../JavaScriptCore/wtf/qt/compat
+    INCLUDEPATH += $$PWD/../WTF/wtf/qt/compat
 }
 
 RESOURCES += \

diff --git a/Source/api.pri b/Source/api.pri
index f3035a9f18d6acdb68b45a8be060fd497e263e07..6c2df7b707eff2d6a7492528a6970ec3a3481a0d 100644 (file)
--- a/Source/api.pri
+++ b/Source/api.pri
@@ -200,7 +200,8 @@ HEADERS += \
 
 INCLUDEPATH += \
     $$PWD/WebKit/qt/Api \
-    $$PWD/WebKit/qt/WebCoreSupport
+    $$PWD/WebKit/qt/WebCoreSupport \
+    $$PWD/WTF/wtf/qt
 
 contains(DEFINES, ENABLE_VIDEO=1) {
     !contains(DEFINES, WTF_USE_QTKIT=1):!contains(DEFINES, WTF_USE_GSTREAMER=1):contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2afe584f6092d2d3240d7401d6466e214dc0abc3..d794d58ee3455ff207d72e853a48a9cc3fbd7f6c 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-22  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Actually move WTF files to their new home
+        https://bugs.webkit.org/show_bug.cgi?id=81844
+
+        [Qt] Unreviewed buildfix after r111778.
+
+        * DumpRenderTree/qt/DumpRenderTree.pro:
+
 2012-03-22  Dan Bernstein  <mitz@apple.com>
 
         Font fallback in WebKitTestRunner depends on user settings

diff --git a/Tools/DumpRenderTree/qt/DumpRenderTree.pro b/Tools/DumpRenderTree/qt/DumpRenderTree.pro
index 54bcdbfe0ae994a88d4e5eb5a9a9b54d71749c3e..c116388510cc6b50fab4c620ff5e8ac2851c71a7 100644 (file)
--- a/Tools/DumpRenderTree/qt/DumpRenderTree.pro
+++ b/Tools/DumpRenderTree/qt/DumpRenderTree.pro
@@ -11,7 +11,7 @@ DESTDIR = $$ROOT_BUILD_DIR/bin
 
 load(features)
 
-WEBKIT += wtf webcore
+WEBKIT += wtf javascriptcore webcore
 
 INCLUDEPATH += \
     $$PWD/.. \
@@ -36,7 +36,7 @@ HEADERS += \
     testplugin.h
 
 SOURCES += \
-    $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore/wtf/Assertions.cpp \
+    $${ROOT_WEBKIT_DIR}/Source/WTF/wtf/Assertions.cpp \
     $$PWD/../WorkQueue.cpp \
     DumpRenderTreeQt.cpp \
     EventSenderQt.cpp \