diff options
| -rw-r--r-- | src/script/script.pro | 23 | ||||
| -rw-r--r-- | sync.profile | 10 |
2 files changed, 20 insertions, 13 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index c558ba8..471ce59 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -1,3 +1,5 @@ +load(qt_module) + TARGET = QtScript QPRO_PWD = $$PWD QT = core @@ -9,22 +11,13 @@ DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore -include(../qbase.pri) +include($$QT_SOURCE_TREE/src/qbase.pri) CONFIG += building-libs -# 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/javascriptcore - GENERATED_SOURCES_DIR = generated -} else { - message(using external WebKit from $$WEBKITDIR) - CONFIG -= QTDIR_build -} +WEBKITDIR = $$PWD/../3rdparty/javascriptcore +GENERATED_SOURCES_DIR = generated + include($$WEBKITDIR/WebKit.pri) # Disable a few warnings on Windows. @@ -54,6 +47,10 @@ qpa:mac { include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) +INCLUDEPATH += $$OUT_PWD/../../include \ + $$OUT_PWD/../../include/QtScript \ + $$OUT_PWD/../../include/QtScript/private + INCLUDEPATH += $$WEBKITDIR/JavaScriptCore INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler diff --git a/sync.profile b/sync.profile new file mode 100644 index 0000000..82a3a8f --- /dev/null +++ b/sync.profile @@ -0,0 +1,10 @@ +%modules = ( # path to module name map + "QtScript" => "$basedir/src/script", +); +%moduleheaders = ( # restrict the module headers to those found in relative path +); +%classnames = ( +); +%mastercontent = ( + "core" => "#include <QtCore/QtCore>\n", +); |