Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Simon Hausmann authored and Qt by Nokia committed Jul 29, 2011
1 parent 43b783d commit d410ad3
Show file tree
Hide file tree
Showing 156 changed files with 17,933 additions and 516 deletions.
2 changes: 1 addition & 1 deletion modules/qt_declarative.pri
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/3rdparty/v8
Submodule v8 updated from bec11b to 472c04
4 changes: 1 addition & 3 deletions src/declarative/debugger/qdeclarativedebughelper.cpp
Expand Up @@ -39,12 +39,10 @@
**
****************************************************************************/

#include <QtScript/QScriptEngine>

#include "private/qdeclarativedebughelper_p.h"

#include <QtCore/QAbstractAnimation>
#include <QtScript/QScriptEngine>
#include <QtDeclarative/QJSEngine>

#include <private/qdeclarativeengine_p.h>
#include <private/qabstractanimation_p.h>
Expand Down

0 comments on commit d410ad3

Please sign in to comment.