diff options
| author | Liang Qi <liang.qi@nokia.com> | 2010-11-25 14:43:30 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:47 +0200 |
| commit | db0beb01985d0778924ad2ceba2e92dab4830061 (patch) | |
| tree | b4f562bcc432b3cad9644e474aa577588f6d1bcf | |
| parent | 1519139c1926446e4a1c7bc862bc3419fc6204c1 (diff) | |
| download | qtscript-db0beb01985d0778924ad2ceba2e92dab4830061.tar.gz | |
Update qtscript by following the new method.
| -rw-r--r-- | modules/qt_script.pri | 9 | ||||
| -rw-r--r-- | modules/qt_scripttools.pri | 9 | ||||
| -rw-r--r-- | src/script/script.pro | 4 | ||||
| -rw-r--r-- | src/scripttools/scripttools.pro | 6 | ||||
| -rw-r--r-- | sync.profile | 4 |
5 files changed, 22 insertions, 10 deletions
diff --git a/modules/qt_script.pri b/modules/qt_script.pri new file mode 100644 index 0000000..cf04bf9 --- /dev/null +++ b/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/modules/qt_scripttools.pri b/modules/qt_scripttools.pri new file mode 100644 index 0000000..2ed4324 --- /dev/null +++ b/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/src/script/script.pro b/src/script/script.pro index 471ce59..e4ff8a3 100644 --- a/src/script/script.pro +++ b/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/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro index 08a7b51..a42eb6a 100644 --- a/src/scripttools/scripttools.pro +++ b/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/sync.profile b/sync.profile index d2f3c40..beedec7 100644 --- a/sync.profile +++ b/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", +); |