summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/declarative/qml/qml.pri3
-rw-r--r--src/declarative/qml/qmlengine.cpp16
-rw-r--r--src/declarative/qml/qmlengine_p.h4
3 files changed, 0 insertions, 23 deletions
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index ee13437..ca78797 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -111,9 +111,6 @@ HEADERS += qml/qmlparser_p.h \
qml/qmltypenamescriptclass_p.h \
qml/qmllistscriptclass_p.h
-# for qtscript debugger
-contains(QT_CONFIG, scripttools):QT += scripttools
-
QT += sql
include(parser/parser.pri)
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 66d4990..1483c8c 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)
@@ -232,12 +227,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()) {
@@ -249,11 +238,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.
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 2e880bb..2f41651 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -112,7 +112,6 @@ public:
struct CapturedProperty {
CapturedProperty(QObject *o, int c, int n)
: object(o), coreIndex(c), notifyIndex(n) {}
- CapturedProperty(const QmlMetaProperty &);
QObject *object;
int coreIndex;
@@ -123,9 +122,6 @@ public:
QmlContext *rootContext;
QmlExpression *currentExpression;
bool isDebugging;
-#ifdef QT_SCRIPTTOOLS_LIB
- QScriptEngineDebugger *debugger;
-#endif
struct ImportedNamespace;
QmlContextScriptClass *contextClass;