diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-13 15:53:15 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-13 15:53:15 (GMT) |
| commit | d49d5b3f0c07563a9532b650461bfa212f587a04 (patch) | |
| tree | b0b4160118aff2bdd3e226dd47957dee5071153e | |
| parent | 9727a71ea077658148e963bc8510269b08095023 (diff) | |
| download | Qt-d49d5b3f0c07563a9532b650461bfa212f587a04.zip Qt-d49d5b3f0c07563a9532b650461bfa212f587a04.tar.gz Qt-d49d5b3f0c07563a9532b650461bfa212f587a04.tar.bz2 | |
get rid of src/script/webkit.pri
Not needed since commit 9727a71ea077658148e963bc8510269b08095023.
| -rw-r--r-- | src/script/script.pro | 45 | ||||
| -rw-r--r-- | src/script/webkit.pri | 42 |
2 files changed, 44 insertions, 43 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index efbeed2..2c13ad3 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -9,6 +9,49 @@ DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO unix:QMAKE_PKGCONFIG_REQUIRES = QtCore include(../qbase.pri) -include(webkit.pri) + +# disable JIT for now +DEFINES += ENABLE_JIT=0 +# FIXME: shared the statically built JavaScriptCore + +# Fetch the base WebKit directory from the WEBKITDIR environment variable; +# fall back to src/3rdparty otherwise +WEBKITDIR = $$(WEBKITDIR) +isEmpty(WEBKITDIR) { + WEBKITDIR = $$PWD/../3rdparty/webkit + + # 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 +} else { + CONFIG += building-libs + CONFIG -= QTDIR_build + include($$WEBKITDIR/WebKit.pri) +} + +include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) + +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/debugger +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/runtime +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wtf +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/unicode +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/interpreter +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/jit +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/profiler +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wrec +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/API +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecode +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/assembler +INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/generated + +DEFINES += BUILDING_QT__=1 +DEFINES += USE_SYSTEM_MALLOC +DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 +DEFINES += WTF_CHANGES=1 +DEFINES += NDEBUG + include(script.pri) diff --git a/src/script/webkit.pri b/src/script/webkit.pri deleted file mode 100644 index 24e877f..0000000 --- a/src/script/webkit.pri +++ /dev/null @@ -1,42 +0,0 @@ -# disable JIT for now -DEFINES += ENABLE_JIT=0 -# FIXME: shared the statically built JavaScriptCore - -# Fetch the base WebKit directory from the WEBKITDIR environment variable; -# fall back to src/3rdparty otherwise -WEBKITDIR = $$(WEBKITDIR) -isEmpty(WEBKITDIR) { - WEBKITDIR = $$PWD/../3rdparty/webkit - - # 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 -} else { - CONFIG += building-libs - CONFIG -= QTDIR_build - include($$WEBKITDIR/WebKit.pri) -} - -include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) - -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/debugger -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/runtime -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wtf -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/unicode -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/interpreter -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/jit -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/profiler -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wrec -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/API -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecode -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/assembler -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/generated - -DEFINES += BUILDING_QT__=1 -DEFINES += USE_SYSTEM_MALLOC -DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 -DEFINES += WTF_CHANGES=1 -DEFINES += NDEBUG |