Fix the build: WebKitQt is now called QtWebKit

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

diff --git a/ChangeLog b/ChangeLog
index 0eabb1f71286a48cbb4893926606983e0891f5aa..696692b239cf459f7405aea98c4bfe1503e7eefe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-13  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        * WebKit.pri: WebKitQt is now called QtWebKit.
+
 2007-05-31  Alp Toker  <alp.toker@collabora.co.uk>
 
         Reviewed by Eric Seidel.

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 513b442fc6bade08f87a35492d5952e2d8b1fe5d..411e62eee9ca2801ccd1bb1be47becfcfcd8b6e7 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-13  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        * kjs/testkjs.pro: WebKitQt is now called QtWebKit.
+
 2007-06-12  Anders Carlsson  <andersca@apple.com>
 
         Another build fix.

diff --git a/JavaScriptCore/kjs/testkjs.pro b/JavaScriptCore/kjs/testkjs.pro
index 035956b7e883d5826f16585d46e91f4eb98c20dc..a2501e88ce447a9e2ba533095ff45d9aa37a0f9c 100644 (file)
--- a/JavaScriptCore/kjs/testkjs.pro
+++ b/JavaScriptCore/kjs/testkjs.pro
@@ -6,7 +6,7 @@ QT -= gui
 DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS 
 INCLUDEPATH += $$PWD/.. $$PWD $$PWD/../bindings $$PWD/../bindings/c $$PWD/../wtf
 qt-port:DEFINES += BUILDING_QT__
-qt-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt
+qt-port:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
 gdk-port {
     QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
     LIBS += $$system(icu-config --ldflags)

diff --git a/WebKit.pri b/WebKit.pri
index 0f86de9690bf11b00f44b0176b836f5adec14cbd..5853baa6db3132584a7cfe4b0dcf7c833024c2b3 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -5,7 +5,7 @@ isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release
 
 !gdk-port:CONFIG += qt-port
 qt-port:DEFINES += BUILDING_QT__=1
-qt-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt
+qt-port:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
 gdk-port:CONFIG += link_pkgconfig
 gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl
 gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__