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/auto/declarative/qdeclarativesqldatabase | |
| 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/auto/declarative/qdeclarativesqldatabase')
| -rw-r--r-- | tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro index c48cdf7b55..a51eaf34de 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro +++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro @@ -1,6 +1,6 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative -QT += sql script +QT += sql macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesqldatabase.cpp @@ -15,4 +15,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private script-private +QT += core-private gui-private declarative-private |