[Qt] Fix build on OS X

We were manually including the directories needed from WTF, instead of
using the WEBKIT qmake variable to add dependencies, which also adds
other tricks from WTF.pri, such as the right include paths for ICU.

Reviewed by Simon Hausmann.

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

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 9f29e08..9ea03dc 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-13  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Fix build on OS X
+
+        We were manually including the directories needed from WTF, instead of
+        using the WEBKIT qmake variable to add dependencies, which also adds
+        other tricks from WTF.pri, such as the right include paths for ICU.
+
+        Reviewed by Simon Hausmann.
+
+        * declarative/experimental/experimental.pri:
+        * declarative/public.pri:
+
 2012-04-12  Balazs Kelemen  <kbalazs@webkit.org>
 
         [Qt] Fix WebKit1 build with V8

diff --git a/Source/WebKit/qt/declarative/experimental/experimental.pri b/Source/WebKit/qt/declarative/experimental/experimental.pri
index 8b015e5..20d5452 100644 (file)
--- a/Source/WebKit/qt/declarative/experimental/experimental.pri
+++ b/Source/WebKit/qt/declarative/experimental/experimental.pri
@@ -35,16 +35,7 @@ SOURCES += plugin.cpp
 
 DEFINES += HAVE_WEBKIT2
 
-# FIXME: Why are these needed, and why can't we use WEBKIT += ... ?
-INCLUDEPATH += \
-    ../../../../WebKit2/Shared/qt \
-    ../../../../JavaScriptCore \
-    ../../../../JavaScriptCore/wtf \
-    ../../../../JavaScriptCore/wtf/unicode \
-    ../../../../JavaScriptCore/runtime \
-    ../../../../WebKit2/Platform \
-    ../../../../WebKit2/Platform/CoreIPC \
-    ../../../../WTF
+WEBKIT += wtf javascriptcore webkit2
 
 target.path = $$[QT_INSTALL_IMPORTS]/$${TARGET.module_name}
 

diff --git a/Source/WebKit/qt/declarative/public.pri b/Source/WebKit/qt/declarative/public.pri
index 12157f7..04b17b7 100644 (file)
--- a/Source/WebKit/qt/declarative/public.pri
+++ b/Source/WebKit/qt/declarative/public.pri
@@ -39,14 +39,6 @@ DESTDIR = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}
 CONFIG += rpath
 RPATHDIR_RELATIVE_TO_DESTDIR = ../../lib
 
-# FIXME: Why are these needed, and why can't we use WEBKIT += ... ?
-INCLUDEPATH += \
-    ../../../WebKit2/Shared/qt \
-    ../../../JavaScriptCore \
-    ../../../JavaScriptCore/runtime \
-    ../../../JavaScriptCore/wtf \
-    ../../../WTF
-
 SOURCES += plugin.cpp
 
 !no_webkit2: {