Use ../generated as path for the generated sources for builds inside Qt

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d1d9b9574d4d8d461ceeeb53fbe6a92ab4fb8e73..9f13f7a3c478554dd32e959f88f808ae8cbcb643 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-22  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by George.
+
+        Use ../generated as path for the generated sources for builds 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 9b12cc5b8319216e9f0e3952d39f749d1639fa37..96b6ccbbdd2bdc1bdc451395f61304c0c376e158 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -11,6 +11,10 @@ TEMPLATE = lib
 qt-port:TARGET = QtWebKit
 gtk-port:TARGET = WebKitGtk
 
+CONFIG(QTDIR_build) {
+    GENERATED_SOURCES_DIR = $$PWD/generated
+}
+
 isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
 GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR/
 win32-*: GENERATED_SOURCES_DIR_SLASH ~= s|/|\|