Don't set OBJECTS_DIR when building inside Qt

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9f13f7a3c478554dd32e959f88f808ae8cbcb643..2d824af295f196cd6483ae0a6d7452bcce29477e 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-22  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by George.
+
+        Don't set OBJECTS_DIR when building inside Qt
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * WebCore.pro:
+
 2007-11-22  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by George.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 96b6ccbbdd2bdc1bdc451395f61304c0c376e158..f084f1008db2449076cae2d37dc493c5a6f5a7b7 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -21,7 +21,7 @@ win32-*: GENERATED_SOURCES_DIR_SLASH ~= s|/|\|
 
 INCLUDEPATH += $$GENERATED_SOURCES_DIR
 
-OBJECTS_DIR = tmp
+!CONFIG(QTDIR_build):OBJECTS_DIR = tmp
 
 DESTDIR = $$OUTPUT_DIR/lib
 DEPENDPATH += css dom loader editing history html \