JavaScriptCore.pri expects OBJECTS_DIR to be set, so set it in
authorhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2007 16:36:04 +0000 (16:36 +0000)
committerhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2007 16:36:04 +0000 (16:36 +0000)
testkjs.pro, too, where it's included from.

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

JavaScriptCore/ChangeLog
JavaScriptCore/kjs/testkjs.pro

index 65938114853a630b181aa791742cdc4547b9ff74..3c135bbe38df69107be2b855bcfb7970f851c094 100644 (file)
@@ -1,3 +1,12 @@
+2007-11-07  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by nobody, Qt/Windows build fix.
+
+        JavaScriptCore.pri expects OBJECTS_DIR to be set, so set it in
+        testkjs.pro, too, where it's included from.
+
+        * kjs/testkjs.pro:
+
 2007-11-07  Simon Hausmann  <shausman@trolltech.com>
 
         Reviewed by Lars.
index 6b63dcecf7c1f8cae8e3c1608eaa2b64f95cdbda..ab3016b02a2c5f9ac0c08481315b809b45e4b2a7 100644 (file)
@@ -16,7 +16,9 @@ QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
 
 isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/../..
 include($$OUTPUT_DIR/config.pri)
-
+OBJECTS_DIR = tmp
+OBJECTS_DIR_WTR = $$OBJECTS_DIR/
+win32-*: OBJECTS_DIR_WTR ~= s|/|\|
 include($$PWD/../JavaScriptCore.pri)
 
 # Hack!  Fix this.