for the Qt build also build testkjs now

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

diff --git a/ChangeLog b/ChangeLog
index 617242893720ee2193a1deddb848ce3ed70fadd1..a57225faca2419d860d905f61958c1334fa0ada0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-17  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Rob Buis.
+
+        * WebKit.pro: Build testkjs.
+
 2006-12-14  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Brady.

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9e9c197b4a916703e7cea3a6e52f3307a701d220..668caa011bb0d3706cd28112a66fb53a4b163c5b 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-17  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Rob Buis.
+
+        * kjs/testkjs.pro: Added .pro file to build testkjs.
+
 2006-12-16  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Rob.

diff --git a/JavaScriptCore/kjs/testkjs.pro b/JavaScriptCore/kjs/testkjs.pro
new file mode 100644 (file)
index 0000000..246654e
--- /dev/null
+++ b/JavaScriptCore/kjs/testkjs.pro
@@ -0,0 +1,14 @@
+TEMPLATE = app
+TARGET = testkjs
+DESTDIR = ..
+SOURCES = testkjs.cpp
+QT -= gui
+DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS 
+DEFINES += BUILDING_QT__
+INCLUDEPATH += $$PWD $$PWD/kjs $$PWD/bindings $$PWD/bindings/c $$PWD/wtf
+LIBS += -L$$OUTPUT_DIR/lib -lJavaScriptCore
+QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
+
+isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/../..
+include($$OUTPUT_DIR/config.pri)
+

diff --git a/WebKit.pro b/WebKit.pro
index f0719d51e4d2cd4360a3424c166a71f0d941916f..ad7f9a1025cfb061aace0a9e31ad4119ae8f19f7 100644 (file)
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -3,5 +3,6 @@ CONFIG += ordered
 SUBDIRS = \
         JavaScriptCore \
         WebCore \
-       WebKitQt/QtLauncher \
-       WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
+        WebKitQt/QtLauncher \
+        WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro \
+        JavaScriptCore/kjs/testkjs.pro