Title: [102925] trunk
- Revision
- 102925
- Author
- [email protected]
- Date
- 2011-12-15 05:16:08 -0800 (Thu, 15 Dec 2011)
Log Message
[Qt] Don't add WebCoreSupport and WebKit APIs to include WebCore's include path
Reviewed Simon Hausmann.
Modified Paths
Diff
Modified: trunk/ChangeLog (102924 => 102925)
--- trunk/ChangeLog 2011-12-15 13:04:53 UTC (rev 102924)
+++ trunk/ChangeLog 2011-12-15 13:16:08 UTC (rev 102925)
@@ -1,3 +1,11 @@
+2011-12-15 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Don't add WebCoreSupport and WebKit APIs to include WebCore's include path
+
+ Reviewed Simon Hausmann.
+
+ * Source/api.pri:
+
2011-12-15 Michael Brüning <[email protected]>
[QT][WK2]Add (experimental) viewport info view to Minibrowser/qt.
Modified: trunk/Source/api.pri (102924 => 102925)
--- trunk/Source/api.pri 2011-12-15 13:04:53 UTC (rev 102924)
+++ trunk/Source/api.pri 2011-12-15 13:16:08 UTC (rev 102925)
@@ -79,7 +79,9 @@
$$PWD/WebKit/qt/WebCoreSupport/TextCheckerClientQt.h \
$$PWD/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.h
-INCLUDEPATH += $$PWD/WebKit/qt/WebCoreSupport
+INCLUDEPATH += \
+ $$PWD/WebKit/qt/Api \
+ $$PWD/WebKit/qt/WebCoreSupport
contains(DEFINES, ENABLE_VIDEO=1) {
!contains(DEFINES, WTF_USE_QTKIT=1):!contains(DEFINES, WTF_USE_GSTREAMER=1):contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
Modified: trunk/Tools/ChangeLog (102924 => 102925)
--- trunk/Tools/ChangeLog 2011-12-15 13:04:53 UTC (rev 102924)
+++ trunk/Tools/ChangeLog 2011-12-15 13:16:08 UTC (rev 102925)
@@ -1,3 +1,11 @@
+2011-12-15 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Don't add WebCoreSupport and WebKit APIs to include WebCore's include path
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/webcore.prf:
+
2011-12-15 Michael Brüning <[email protected]>
[QT][WK2]Add (experimental) viewport info view to Minibrowser/qt.
Modified: trunk/Tools/qmake/mkspecs/features/webcore.prf (102924 => 102925)
--- trunk/Tools/qmake/mkspecs/features/webcore.prf 2011-12-15 13:04:53 UTC (rev 102924)
+++ trunk/Tools/qmake/mkspecs/features/webcore.prf 2011-12-15 13:16:08 UTC (rev 102925)
@@ -112,8 +112,6 @@
$$SOURCE_DIR/WebCore/platform/graphics/qt \
$$SOURCE_DIR/WebCore/platform/network/qt \
$$SOURCE_DIR/WebCore/platform/qt \
- $$SOURCE_DIR/WebKit/qt/Api \
- $$SOURCE_DIR/WebKit/qt/WebCoreSupport \
$$WEBCORE_INCLUDEPATH
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
