3 files changed, 13 insertions, 5 deletions
diff --git a/src/qml/debugger/qqmldebugconnector.cpp b/src/qml/debugger/qqmldebugconnector.cpp
index 3adf335ffd..8a16d56c45 100644
--- a/src/qml/debugger/qqmldebugconnector.cpp
+++ b/src/qml/debugger/qqmldebugconnector.cpp
@@ -164,7 +164,10 @@ QQmlDebugConnectorFactory::~QQmlDebugConnectorFactory()
 {
     // This is triggered when the plugin is unloaded.
     QQmlDebugConnectorParams *params = qmlDebugConnectorParams();
-    if (params && params->instance) {
+    if (params) {
+        params->pluginKey.clear();
+        params->arguments.clear();
+        params->services.clear();
         delete params->instance;
         params->instance = 0;
     }
diff --git a/src/qml/debugger/qqmlmemoryprofiler.cpp b/src/qml/debugger/qqmlmemoryprofiler.cpp
index 53d4e7ab21..b89dbfd02d 100644
--- a/src/qml/debugger/qqmlmemoryprofiler.cpp
+++ b/src/qml/debugger/qqmlmemoryprofiler.cpp
@@ -62,13 +62,13 @@ static qmlmemprofile_pop_location *memprofile_pop_location;
 static qmlmemprofile_save *memprofile_save;
 static qmlmemprofile_is_enabled *memprofile_is_enabled;
 
-#ifndef QT_NO_LIBRARY
+#if QT_CONFIG(library)
 extern QFunctionPointer qt_linux_find_symbol_sys(const char *symbol);
 #endif
 
 bool QQmlMemoryScope::doOpenLibrary()
 {
-#if defined(Q_OS_LINUX) && !defined(QT_NO_LIBRARY)
+#if defined(Q_OS_LINUX) && QT_CONFIG(library)
     if (state == Unloaded) {
         memprofile_stats = (qmlmemprofile_stats *) qt_linux_find_symbol_sys("qmlmemprofile_stats");
         memprofile_clear = (qmlmemprofile_clear *) qt_linux_find_symbol_sys("qmlmemprofile_clear");
diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h
index 6643695d11..242f26ee0d 100644
--- a/src/qml/debugger/qqmlprofiler_p.h
+++ b/src/qml/debugger/qqmlprofiler_p.h
@@ -204,6 +204,11 @@ public:
             ref(new BindingRefCount(binding), QQmlRefPointer<QQmlRefCount>::Adopt), sent(false)
         {}
 
+        RefLocation(QQmlBinding *binding, QV4::Function *function) :
+            Location(function->sourceLocation()), locationType(Binding),
+            ref(new BindingRefCount(binding), QQmlRefPointer<QQmlRefCount>::Adopt), sent(false)
+        {}
+
         RefLocation(QV4::CompiledData::CompilationUnit *ref, const QUrl &url, const QV4::CompiledData::Object *obj,
                     const QString &type) :
             Location(QQmlSourceLocation(type, obj->location.line, obj->location.column), url),
@@ -231,7 +236,7 @@ public:
 
     typedef QHash<quintptr, Location> LocationHash;
 
-    void startBinding(QQmlBinding *binding, QV4::FunctionObject *function)
+    void startBinding(QQmlBinding *binding, QV4::Function *function)
     {
         quintptr locationId(id(binding));
         m_data.append(QQmlProfilerData(m_timer.nsecsElapsed(),
@@ -326,7 +331,7 @@ struct QQmlProfilerHelper : public QQmlProfilerDefinitions {
 
 struct QQmlBindingProfiler : public QQmlProfilerHelper {
     QQmlBindingProfiler(QQmlProfiler *profiler, QQmlBinding *binding,
-                        QV4::FunctionObject *function) :
+                        QV4::Function *function) :
         QQmlProfilerHelper(profiler)
     {
         Q_QML_PROFILE(QQmlProfilerDefinitions::ProfileBinding, profiler,