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 /src/declarative/declarative.pro | |
| 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 'src/declarative/declarative.pro')
| -rw-r--r-- | src/declarative/declarative.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index aa638e468e..2d9248ef66 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -6,7 +6,7 @@ QPRO_PWD = $$PWD CONFIG += module MODULE_PRI += ../../modules/qt_declarative.pri -QT = core-private gui-private script-private network script opengl-private +QT = core-private gui-private network opengl-private contains(QT_CONFIG, svg): QT += svg DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 |