From e58916de4d849a28d291c6d62b27d48a6e9517f0 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 9 Sep 2009 16:21:38 +0200
Subject: Fix QtScript compilation against external JSC sources

Print a message when doing so and don't re-define qmake functions that
come from JavaScriptCore.pri.

Reviewed-by: Trust me
---
 src/script/script.pro | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/script')

diff --git a/src/script/script.pro b/src/script/script.pro
index a03b6521a8..1a793b2141 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -24,7 +24,17 @@ isEmpty(WEBKITDIR) {
     # FIXME: not needed once JSCBISON works
     # TODO: or leave it like this since the generated file is available anyway?
     SOURCES += $$WEBKITDIR/JavaScriptCore/generated/Grammar.cpp
+
+    # avoid warnings when parsing JavaScriptCore.pri
+    # (we don't care about generating files, we already have them generated)
+    defineTest(addExtraCompiler) {
+        return(true)
+    }
+    defineTest(addExtraCompilerWithHeader) {
+        return(true)
+    }
 } else {
+    message(using external WebKit from $$WEBKITDIR)
     CONFIG += building-libs
     CONFIG -= QTDIR_build
     include($$WEBKITDIR/WebKit.pri)
@@ -38,15 +48,6 @@ wince* {
     LIBS += -lmmtimer
 }
 
-# avoid warnings when parsing JavaScriptCore.pri
-# (we don't care about generating files, we already have them generated)
-defineTest(addExtraCompiler) {
-    return(true)
-}
-defineTest(addExtraCompilerWithHeader) {
-    return(true)
-}
-
 include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri)
 
 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore
-- 
cgit v1.2.1