diff options
Diffstat (limited to 'src/script/script.pro')
| -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 301386d..d8a5f87 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -26,7 +26,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) @@ -40,15 +50,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 |