1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
From 6004f320fc98d83e2c3de19b305b3d8604f4a665 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Fri, 19 Nov 2010 11:57:48 +0100
Subject: [PATCH] First attempt to build script.
---
qtscript/src/script/script.pro | 21 +++++++++------------
qtscript/sync.profile | 10 ++++++++++
2 files changed, 19 insertions(+), 12 deletions(-)
create mode 100644 qtscript/sync.profile
diff --git a/qtscript/src/script/script.pro b/qtscript/src/script/script.pro
index 34f4a88..6e1e598 100644
--- a/qtscript/src/script/script.pro
+++ b/qtscript/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/qtscript/sync.profile b/qtscript/sync.profile
new file mode 100644
index 0000000..82a3a8f
--- /dev/null
+++ b/qtscript/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",
+);
--
1.7.3.2.343.g7d43d
|
