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
79
80
81
82
83
84
85
86
87
88
89
90
|
From 7dd08edfb3d97293aafc8cd45d7efb85da0762cc Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Thu, 25 Nov 2010 14:43:30 +0100
Subject: [PATCH] Update qtscript by following the new method.
---
qtscript/modules/qt_script.pri | 9 +++++++++
qtscript/modules/qt_scripttools.pri | 9 +++++++++
qtscript/src/script/script.pro | 4 ----
qtscript/src/scripttools/scripttools.pro | 6 ------
qtscript/sync.profile | 4 ++++
5 files changed, 22 insertions(+), 10 deletions(-)
create mode 100644 qtscript/modules/qt_script.pri
create mode 100644 qtscript/modules/qt_scripttools.pri
diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri
new file mode 100644
index 0000000..cf04bf9
--- /dev/null
+++ b/qtscript/modules/qt_script.pri
@@ -0,0 +1,9 @@
+QT_SCRIPT_VERSION = $$QT_VERSION
+QT_SCRIPT_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT_SCRIPT_MINOR_VERSION = $$QT_MINOR_VERSION
+QT_SCRIPT_PATCH_VERSION = $$QT_PATCH_VERSION
+
+QT.script.name = QtScript
+QT.script.includes = $$QT_MODULE_INCLUDE_BASE/QtScript
+QT.script.libs = $$QT_MODULE_LIB_BASE
+QT.script.depends = core
diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri
new file mode 100644
index 0000000..2ed4324
--- /dev/null
+++ b/qtscript/modules/qt_scripttools.pri
@@ -0,0 +1,9 @@
+QT_SCRIPTTOOLS_VERSION = $$QT_VERSION
+QT_SCRIPTTOOLS_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT_SCRIPTTOOLS_MINOR_VERSION = $$QT_MINOR_VERSION
+QT_SCRIPTTOOLS_PATCH_VERSION = $$QT_PATCH_VERSION
+
+QT.scripttools.name = QtScriptTools
+QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE/QtScriptTools
+QT.scripttools.libs = $$QT_MODULE_LIB_BASE
+QT.scripttools.depends = script gui network
diff --git a/qtscript/src/script/script.pro b/qtscript/src/script/script.pro
index 6e1e598..3d01850 100644
--- a/qtscript/src/script/script.pro
+++ b/qtscript/src/script/script.pro
@@ -47,10 +47,6 @@ 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/src/scripttools/scripttools.pro b/qtscript/src/scripttools/scripttools.pro
index 08a7b51..a42eb6a 100644
--- a/qtscript/src/scripttools/scripttools.pro
+++ b/qtscript/src/scripttools/scripttools.pro
@@ -13,10 +13,4 @@ include($$QT_SOURCE_TREE/src/qbase.pri)
include(debugging/debugging.pri)
-INCLUDEPATH += $$OUT_PWD/../../include \
- $$OUT_PWD/../../include/QtScript \
- $$OUT_PWD/../../include/QtScript/private \
- $$OUT_PWD/../../include/QtScriptTools \
- $$OUT_PWD/../../include/QtScriptTools/private
-
symbian:TARGET.UID3=0x2001E625
diff --git a/qtscript/sync.profile b/qtscript/sync.profile
index d2f3c40..beedec7 100644
--- a/qtscript/sync.profile
+++ b/qtscript/sync.profile
@@ -11,3 +11,7 @@
"gui" => "#include <QtGui/QtGui>\n",
"scripttools" => "#include <QtScriptTools/QtScriptTools>\n",
);
+%modulepris = (
+ "QtScript" => "$basedir/modules/qt_script.pri",
+ "QtScriptTools" => "$basedir/modules/qt_scripttools.pri",
+);
--
1.7.3.2.343.g7d43d
|
