diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2011-07-29 10:25:44 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-29 13:00:52 +0200 |
commit | d410ad364ec0b8877797145c68a4d7c3c98ce1c0 (patch) | |
tree | 11862c21e5e465abe3275768918f82cbec2bc6e7 /modules/qt_declarative.pri | |
parent | 43b783d09e0899165bbe964a175785ccdfedf6e5 (diff) |
Merge the QJSEngine and QJSValue development branch into master.
This replaces the dependency to QtScript with two new builtin classes
QJSValue and QJSEngine.
This is still work in progress, development continues now in the master branch.
Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de
Reviewed-on: http://codereview.qt.nokia.com/2299
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'modules/qt_declarative.pri')
-rw-r--r-- | modules/qt_declarative.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri index ed1750e55c..ef7db54a2b 100644 --- a/modules/qt_declarative.pri +++ b/modules/qt_declarative.pri @@ -11,7 +11,7 @@ QT.declarative.sources = $$QT_MODULE_BASE/src/declarative QT.declarative.libs = $$QT_MODULE_LIB_BASE QT.declarative.plugins = $$QT_MODULE_PLUGIN_BASE QT.declarative.imports = $$QT_MODULE_IMPORT_BASE -QT.declarative.depends = gui script network opengl xmlpatterns +QT.declarative.depends = gui network opengl xmlpatterns QT.declarative.DEFINES = QT_DECLARATIVE_LIB QT_CONFIG += declarative |