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 /tests/benchmarks | |
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 'tests/benchmarks')
-rw-r--r-- | tests/benchmarks/declarative/holistic/holistic.pro | 2 | ||||
-rw-r--r-- | tests/benchmarks/declarative/holistic/testtypes.h | 2 | ||||
-rw-r--r-- | tests/benchmarks/declarative/script/script.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/benchmarks/declarative/holistic/holistic.pro b/tests/benchmarks/declarative/holistic/holistic.pro index 7f27696d60..fadb04db88 100644 --- a/tests/benchmarks/declarative/holistic/holistic.pro +++ b/tests/benchmarks/declarative/holistic/holistic.pro @@ -1,7 +1,7 @@ load(qttest_p4) TEMPLATE = app TARGET = tst_holistic -QT += declarative script network +QT += declarative network macx:CONFIG -= app_bundle CONFIG += release diff --git a/tests/benchmarks/declarative/holistic/testtypes.h b/tests/benchmarks/declarative/holistic/testtypes.h index 5a2b1c8ab1..7d1a59da44 100644 --- a/tests/benchmarks/declarative/holistic/testtypes.h +++ b/tests/benchmarks/declarative/holistic/testtypes.h @@ -53,7 +53,7 @@ #include <QtGui/qpixmap.h> #include <QtGui/qvector3d.h> #include <QtCore/qdatetime.h> -#include <QtScript/qscriptvalue.h> +#include <QtScript/qjsvalue.h> #include <QtDeclarative/qdeclarativescriptstring.h> #include <QtDeclarative/qdeclarativecomponent.h> diff --git a/tests/benchmarks/declarative/script/script.pro b/tests/benchmarks/declarative/script/script.pro index 75faa5cf38..01df571fda 100644 --- a/tests/benchmarks/declarative/script/script.pro +++ b/tests/benchmarks/declarative/script/script.pro @@ -1,7 +1,7 @@ load(qttest_p4) TEMPLATE = app TARGET = tst_script -QT += declarative script +QT += declarative macx:CONFIG -= app_bundle CONFIG += release |