diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-16 05:46:33 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-16 05:46:33 (GMT) |
| commit | 1c029319fb787c1ef6bce0f76fff991679b944f2 (patch) | |
| tree | 35f0d2ec9bdac1ac6f1a03ae249b2f9d7765b243 /src/declarative/qml/qmlengine.cpp | |
| parent | a62fbc821c3c32c0ebe63a77f2705d6f1db67394 (diff) | |
| parent | ee6c7d5cdc7707a5eb50a46ba8056a6b43348159 (diff) | |
| download | Qt-1c029319fb787c1ef6bce0f76fff991679b944f2.zip Qt-1c029319fb787c1ef6bce0f76fff991679b944f2.tar.gz Qt-1c029319fb787c1ef6bce0f76fff991679b944f2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index c8848fd..b9729ad 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -47,10 +47,6 @@ #include <private/qscriptdeclarativeclass_p.h> #include <private/qmlglobalscriptclass_p.h> -#ifdef QT_SCRIPTTOOLS_LIB -#include <QScriptEngineDebugger> -#endif - #include <QScriptClass> #include <QNetworkReply> #include <QNetworkRequest> @@ -101,7 +97,6 @@ Q_DECLARE_METATYPE(QList<QObject *>); QT_BEGIN_NAMESPACE -DEFINE_BOOL_CONFIG_OPTION(qmlDebugger, QML_DEBUGGER) DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE) QML_DEFINE_TYPE(Qt,4,6,Object,QObject) @@ -229,12 +224,6 @@ void QmlEnginePrivate::init() typeNameClass = new QmlTypeNameScriptClass(q); listClass = new QmlListScriptClass(q); rootContext = new QmlContext(q,true); -#ifdef QT_SCRIPTTOOLS_LIB - if (qmlDebugger()){ - debugger = new QScriptEngineDebugger(q); - debugger->attachTo(&scriptEngine); - } -#endif if (QCoreApplication::instance()->thread() == q->thread() && QmlEngineDebugServer::isDebuggingEnabled()) { @@ -246,11 +235,6 @@ void QmlEnginePrivate::init() } } -QmlEnginePrivate::CapturedProperty::CapturedProperty(const QmlMetaProperty &p) -: object(p.object()), coreIndex(p.coreIndex()), notifyIndex(p.property().notifySignalIndex()) -{ -} - /*! \class QmlEngine \brief The QmlEngine class provides an environment for instantiating QML components. |