Title: [114106] trunk/Source/WebKit/qt
- Revision
- 114106
- Author
- [email protected]
- Date
- 2012-04-13 03:37:51 -0700 (Fri, 13 Apr 2012)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (114105 => 114106)
--- trunk/Source/WebKit/qt/ChangeLog 2012-04-13 10:23:18 UTC (rev 114105)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-04-13 10:37:51 UTC (rev 114106)
@@ -1,3 +1,16 @@
+2012-04-13 Tor Arne Vestbø <[email protected]>
+
+ [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 <[email protected]>
[Qt] Fix WebKit1 build with V8
Modified: trunk/Source/WebKit/qt/declarative/experimental/experimental.pri (114105 => 114106)
--- trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-04-13 10:23:18 UTC (rev 114105)
+++ trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-04-13 10:37:51 UTC (rev 114106)
@@ -35,16 +35,7 @@
DEFINES += HAVE_WEBKIT2
-# FIXME: Why are these needed, and why can't we use WEBKIT += ... ?
-INCLUDEPATH += \
- ../../../../WebKit2/Shared/qt \
- ../../../../_javascript_Core \
- ../../../../_javascript_Core/wtf \
- ../../../../_javascript_Core/wtf/unicode \
- ../../../../_javascript_Core/runtime \
- ../../../../WebKit2/Platform \
- ../../../../WebKit2/Platform/CoreIPC \
- ../../../../WTF
+WEBKIT += wtf _javascript_core webkit2
target.path = $$[QT_INSTALL_IMPORTS]/$${TARGET.module_name}
Modified: trunk/Source/WebKit/qt/declarative/public.pri (114105 => 114106)
--- trunk/Source/WebKit/qt/declarative/public.pri 2012-04-13 10:23:18 UTC (rev 114105)
+++ trunk/Source/WebKit/qt/declarative/public.pri 2012-04-13 10:37:51 UTC (rev 114106)
@@ -39,14 +39,6 @@
CONFIG += rpath
RPATHDIR_RELATIVE_TO_DESTDIR = ../../lib
-# FIXME: Why are these needed, and why can't we use WEBKIT += ... ?
-INCLUDEPATH += \
- ../../../WebKit2/Shared/qt \
- ../../../_javascript_Core \
- ../../../_javascript_Core/runtime \
- ../../../_javascript_Core/wtf \
- ../../../WTF
-
SOURCES += plugin.cpp
!no_webkit2: {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
