Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjs
  Fix assert
  Compile fix for Symbian
  Debugger: Fix autotest breakage
  Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*
  Rename QDeclarativeEngineDebugServer to ~Service
  Fix aliasing bug when compiled with gcc 4.6
  Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.h
  FocusScope's focusItem must always be a descendent
  QDeclarativeDebugJs: Disable unstable autotest
  Add qdeclarativedebugjs autotests to declarative.pro
  tests: Use CONFIG option instead of QDeclarativeDebugHelper class

1 files changed, 4 insertions, 4 deletions

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 34014f7..1417b78 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -51,7 +51,7 @@
 #include "qdeclarativecomponent.h"
 #include "private/qdeclarativebinding_p_p.h"
 #include "private/qdeclarativevme_p.h"
-#include "private/qdeclarativeenginedebug_p.h"
+#include "private/qdeclarativeenginedebugservice_p.h"
 #include "private/qdeclarativestringconverters_p.h"
 #include "private/qdeclarativexmlhttprequest_p.h"
 #include "private/qdeclarativesqldatabase_p.h"
@@ -581,9 +581,9 @@ void QDeclarativeEnginePrivate::init()
     scriptEngine.globalObject().property(QLatin1String("Qt")).setProperty(QLatin1String("application"), applicationObject);
 
     if (QCoreApplication::instance()->thread() == q->thread() &&
-        QDeclarativeEngineDebugServer::isDebuggingEnabled()) {
+        QDeclarativeEngineDebugService::isDebuggingEnabled()) {
         isDebugging = true;
-        QDeclarativeEngineDebugServer::instance()->addEngine(q);
+        QDeclarativeEngineDebugService::instance()->addEngine(q);
         QJSDebugService::instance()->addEngine(q);
     }
 }
@@ -648,7 +648,7 @@ QDeclarativeEngine::~QDeclarativeEngine()
 {
     Q_D(QDeclarativeEngine);
     if (d->isDebugging) {
-        QDeclarativeEngineDebugServer::instance()->remEngine(this);
+        QDeclarativeEngineDebugService::instance()->remEngine(this);
         QJSDebugService::instance()->removeEngine(this);
     }
 }