[Qt] Don't add WebCoreSupport and WebKit APIs to include WebCore's include path
authorvestbo@webkit.org <vestbo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Dec 2011 13:16:08 +0000 (13:16 +0000)
committervestbo@webkit.org <vestbo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Dec 2011 13:16:08 +0000 (13:16 +0000)
Reviewed Simon Hausmann.

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

ChangeLog
Source/api.pri
Tools/ChangeLog
Tools/qmake/mkspecs/features/webcore.prf

index 8fae954..f073fef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-15  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [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  <michael.bruning@nokia.com>
 
         [QT][WK2]Add (experimental) viewport info view to Minibrowser/qt.
index d72b3ab..ab658e4 100644 (file)
@@ -79,7 +79,9 @@ HEADERS += \
     $$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) {
index 4777de0..49c0c8c 100644 (file)
@@ -1,3 +1,11 @@
+2011-12-15  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [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  <michael.bruning@nokia.com>
 
         [QT][WK2]Add (experimental) viewport info view to Minibrowser/qt.
index ff81d7d..cb5b280 100644 (file)
@@ -112,8 +112,6 @@ WEBCORE_INCLUDEPATH = \
     $$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