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/qtquick1/util | |
| 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/qtquick1/util')
| -rw-r--r-- | src/qtquick1/util/qdeclarativebind.cpp | 5 | ||||
| -rw-r--r-- | src/qtquick1/util/qdeclarativelistmodel.cpp | 2 | ||||
| -rw-r--r-- | src/qtquick1/util/qdeclarativelistmodel_p.h | 2 | ||||
| -rw-r--r-- | src/qtquick1/util/qdeclarativelistmodel_p_p.h | 2 | ||||
| -rw-r--r-- | src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h | 2 | ||||
| -rw-r--r-- | src/qtquick1/util/qdeclarativeview.cpp | 1 |
6 files changed, 6 insertions, 8 deletions
diff --git a/src/qtquick1/util/qdeclarativebind.cpp b/src/qtquick1/util/qdeclarativebind.cpp index f6463be05d..50514234a3 100644 --- a/src/qtquick1/util/qdeclarativebind.cpp +++ b/src/qtquick1/util/qdeclarativebind.cpp @@ -49,9 +49,8 @@ #include <QtCore/qfile.h> #include <QtCore/qdebug.h> -#include <QtScript/qscriptvalue.h> -#include <QtScript/qscriptcontext.h> -#include <QtScript/qscriptengine.h> +#include <QtDeclarative/qjsvalue.h> +#include <QtDeclarative/qjsengine.h> #include <private/qobject_p.h> diff --git a/src/qtquick1/util/qdeclarativelistmodel.cpp b/src/qtquick1/util/qdeclarativelistmodel.cpp index 5d60ed9658..520d9ac388 100644 --- a/src/qtquick1/util/qdeclarativelistmodel.cpp +++ b/src/qtquick1/util/qdeclarativelistmodel.cpp @@ -52,7 +52,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qstack.h> #include <QXmlStreamReader> -#include <QtScript/qscriptvalueiterator.h> +#include <QtDeclarative/qscriptvalueiterator.h> Q_DECLARE_METATYPE(QListModelInterface *) diff --git a/src/qtquick1/util/qdeclarativelistmodel_p.h b/src/qtquick1/util/qdeclarativelistmodel_p.h index 21398f7213..1be5e6001a 100644 --- a/src/qtquick1/util/qdeclarativelistmodel_p.h +++ b/src/qtquick1/util/qdeclarativelistmodel_p.h @@ -51,7 +51,7 @@ #include <QtCore/QList> #include <QtCore/QVariant> #include <QtQuick1/private/qlistmodelinterface_p.h> -#include <QtScript/qscriptvalue.h> +#include <QtDeclarative/qjsvalue.h> QT_BEGIN_HEADER diff --git a/src/qtquick1/util/qdeclarativelistmodel_p_p.h b/src/qtquick1/util/qdeclarativelistmodel_p_p.h index e34f6d850d..ee39ba45b1 100644 --- a/src/qtquick1/util/qdeclarativelistmodel_p_p.h +++ b/src/qtquick1/util/qdeclarativelistmodel_p_p.h @@ -58,7 +58,7 @@ #include "QtQuick1/private/qdeclarativeopenmetaobject_p.h" #include <QtDeclarative/qdeclarative.h> -#include <QtScript/private/qscriptdeclarativeclass_p.h> +#include <QtDeclarative/private/qscriptdeclarativeclass_p.h> QT_BEGIN_HEADER diff --git a/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h b/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h index f0979c4b31..a769185607 100644 --- a/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h +++ b/src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h @@ -55,7 +55,7 @@ #include <QtDeclarative/qdeclarative.h> -#include <QtScript/qscriptvalue.h> +#include <QtDeclarative/qjsvalue.h> #include <QtGui/qevent.h> #include <QMutex> #include <QWaitCondition> diff --git a/src/qtquick1/util/qdeclarativeview.cpp b/src/qtquick1/util/qdeclarativeview.cpp index 32f2183cad..d10d34fcd1 100644 --- a/src/qtquick1/util/qdeclarativeview.cpp +++ b/src/qtquick1/util/qdeclarativeview.cpp @@ -51,7 +51,6 @@ #include <QtDeclarative/private/qdeclarativedebugtrace_p.h> #include <QtDeclarative/private/qdeclarativeinspectorservice_p.h> -#include <qscriptvalueiterator.h> #include <qdebug.h> #include <qtimer.h> #include <qevent.h> |