diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-09 14:21:38 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-09 15:51:54 (GMT) |
| commit | e58916de4d849a28d291c6d62b27d48a6e9517f0 (patch) | |
| tree | 8b6e94e4db0b81f98f00d9e7b431c9ccbc6b9d2c /src/script | |
| parent | bd599aa2f53a26501c26ed6dd020e237646ca721 (diff) | |
| download | Qt-e58916de4d849a28d291c6d62b27d48a6e9517f0.zip Qt-e58916de4d849a28d291c6d62b27d48a6e9517f0.tar.gz Qt-e58916de4d849a28d291c6d62b27d48a6e9517f0.tar.bz2 | |
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
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/script.pro | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index a03b652..1a793b2 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 |