QT_BEGIN_NAMESPACE
-QScriptEngine *QDeclarativeDebugHelper::getScriptEngine(QDeclarativeEngine *engine)
-{
- return QDeclarativeEnginePrivate::getScriptEngine(engine);
-}
-
void QDeclarativeDebugHelper::setAnimationSlowDownFactor(qreal factor)
{
QUnifiedTimer *timer = QUnifiedTimer::instance();
QT_BEGIN_NAMESPACE
-class QScriptEngine;
class QDeclarativeEngine;
// Helper methods to access private API through a stable interface
class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
{
public:
- static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
static void setAnimationSlowDownFactor(qreal factor);
// Enables remote debugging functionality
QJSDebuggerAgent::QJSDebuggerAgent(QDeclarativeEngine *engine, QObject *parent)
: QObject(parent)
- , QScriptEngineAgent(QDeclarativeDebugHelper::getScriptEngine(engine))
+ , QScriptEngineAgent(0)
, d(new QJSDebuggerAgentPrivate(this))
{
QJSDebuggerAgent::engine()->setAgent(this);
#include <QtCore/qcryptographichash.h>
#include <private/qobject_p.h>
-#include <private/qscriptdeclarativeclass_p.h>
#include <private/qdeclarativeitemsmodule_p.h>
#include <private/qdeclarativeutilmodule_p.h>
QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e)
: captureProperties(false), rootContext(0), isDebugging(false),
outputWarningsToStdErr(true), sharedContext(0), sharedScope(0),
- cleanup(0), erroredBindings(0), inProgressCreations(0), scriptEngine(this),
+ cleanup(0), erroredBindings(0), inProgressCreations(0),
workerScriptEngine(0), componentAttached(0), inBeginCreate(false),
networkAccessManager(0), networkAccessManagerFactory(0),
scarceResourcesRefCount(0), typeLoader(e), importDatabase(e), uniqueId(1),
}
}
-QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate *priv)
-: p(priv)
-{
- // Note that all documentation for stuff put on the global object goes in
- // doc/src/declarative/globalobject.qdoc
-
- QScriptValue qtObject =
- newQMetaObject(StaticQtMetaObject::get());
- globalObject().setProperty(QLatin1String("Qt"), qtObject);
-
- // translation functions need to be installed
- // before the global script class is constructed (QTBUG-6437)
- installTranslatorFunctions();
-}
-
-QDeclarativeScriptEngine::~QDeclarativeScriptEngine()
-{
-}
-
-QNetworkAccessManager *QDeclarativeScriptEngine::networkAccessManager()
-{
- return p->getNetworkAccessManager();
-}
-
QDeclarativeEnginePrivate::~QDeclarativeEnginePrivate()
{
Q_ASSERT(inProgressCreations == 0);
delete this;
}
-void QDeclarativeData::parentChanged(QObject *, QObject *parent)
+void QDeclarativeData::parentChanged(QObject *object, QObject *parent)
{
- // XXX aakenned
-// if (!parent && scriptValue) { delete scriptValue; scriptValue = 0; }
+ Q_UNUSED(object);
+ Q_UNUSED(parent);
}
void QDeclarativeData::objectNameChanged(QObject *)
#include "private/qdeclarativedirparser_p.h"
#include "private/qintrusivelist_p.h"
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptString>
#include <QtCore/qstring.h>
#include <QtCore/qlist.h>
#include <QtCore/qpair.h>
#include <QtCore/qstack.h>
#include <QtCore/qmutex.h>
-#include <QtScript/qscriptengine.h>
#include <private/qobject_p.h>
class QDeclarativeExpression;
class QDeclarativeImportDatabase;
class ScarceResourceData;
-class QScriptEngineDebugger;
class QNetworkReply;
class QNetworkAccessManager;
class QDeclarativeNetworkAccessManagerFactory;
class QDeclarativeAbstractBinding;
-class QScriptDeclarativeClass;
class QDeclarativeTypeNameCache;
class QDeclarativeComponentAttached;
class QDeclarativeCleanup;
class QSGTexture;
class QSGContext;
-class QDeclarativeScriptEngine : public QScriptEngine
-{
-public:
- QDeclarativeScriptEngine(QDeclarativeEnginePrivate *priv);
- virtual ~QDeclarativeScriptEngine();
-
- static QDeclarativeScriptEngine *get(QScriptEngine* e) { return static_cast<QDeclarativeScriptEngine*>(e); }
-
- QDeclarativeEnginePrivate *p;
-
- QUrl baseUrl;
-
- virtual QNetworkAccessManager *networkAccessManager();
-};
-
class Q_AUTOTEST_EXPORT QDeclarativeEnginePrivate : public QObjectPrivate
{
Q_DECLARE_PUBLIC(QDeclarativeEngine)
// V8 Engine
QV8Engine v8engine;
- QDeclarativeScriptEngine scriptEngine;
-
QDeclarativeWorkerScriptEngine *getWorkerScriptEngine();
QDeclarativeWorkerScriptEngine *workerScriptEngine;
static void warning(QDeclarativeEnginePrivate *, const QList<QDeclarativeError> &);
static QV8Engine *getV8Engine(QDeclarativeEngine *e) { return &e->d_func()->v8engine; }
- static QScriptEngine *getScriptEngine(QDeclarativeEngine *e) { return &e->d_func()->scriptEngine; }
- static QDeclarativeEngine *getEngine(QScriptEngine *e) { return static_cast<QDeclarativeScriptEngine*>(e)->p->q_func(); }
static QDeclarativeEnginePrivate *get(QDeclarativeEngine *e) { return e->d_func(); }
static QDeclarativeEnginePrivate *get(QDeclarativeContext *c) { return (c && c->engine()) ? QDeclarativeEnginePrivate::get(c->engine()) : 0; }
static QDeclarativeEnginePrivate *get(QDeclarativeContextData *c) { return (c && c->engine) ? QDeclarativeEnginePrivate::get(c->engine) : 0; }
- static QDeclarativeEnginePrivate *get(QScriptEngine *e) { return static_cast<QDeclarativeScriptEngine*>(e)->p; }
static QDeclarativeEngine *get(QDeclarativeEnginePrivate *p) { return p->q_func(); }
static QString urlToLocalFileOrQrc(const QUrl& url);