[Qt] Rollout r102769, because it broke Qt-4.8 builds.
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Dec 2011 16:29:50 +0000 (16:29 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Dec 2011 16:29:50 +0000 (16:29 +0000)
.:

* Source/api.pri:

Tools:

* qmake/mkspecs/features/webcore.prf:

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

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

index b3b74ba..14ef3eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-14  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [Qt] Rollout r102769, because it broke Qt-4.8 builds.
+
+        * Source/api.pri:
+
 2011-12-14  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         [Qt] Don't add WebCoreSupport and WebKit APIs to include WebCore's include path
index ab658e4..d72b3ab 100644 (file)
@@ -79,9 +79,7 @@ HEADERS += \
     $$PWD/WebKit/qt/WebCoreSupport/TextCheckerClientQt.h \
     $$PWD/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.h
 
-INCLUDEPATH += \
-    $$PWD/WebKit/qt/Api \
-    $$PWD/WebKit/qt/WebCoreSupport
+INCLUDEPATH += $$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 ec7b4ff..aecd46d 100644 (file)
@@ -1,3 +1,9 @@
+2011-12-14  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [Qt] Rollout r102769, because it broke Qt-4.8 builds.
+
+        * qmake/mkspecs/features/webcore.prf:
+
 2011-12-14  Balazs Kelemen  <kbalazs@webkit.org>
 
         [Qt] Test fonts are not used with Qt5
index cb5b280..ff81d7d 100644 (file)
@@ -112,6 +112,8 @@ 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