diff options
author | Kai Koehne <[email protected]> | 2010-09-16 12:29:06 +0200 |
---|---|---|
committer | Kai Koehne <[email protected]> | 2010-09-16 15:48:00 +0200 |
commit | bf3be741fd06b78a1c046d965ab4c0cfdb4536f3 (patch) | |
tree | 65d2764a2b9454069b93c4d626fa720ebb43f917 /src/tools/qml | |
parent | d1f1d44c282055ec5252df3826c048e03121c00d (diff) |
QmlJSDebugger: Rename QDDesignServer to QDObserverService
The class extends the QDDebugService class, _not_ QDDebugServer. It's
right that there is also a QDEngineDebugServer being actually a service
in QtDeclarative, but we should probably fix this one too.
Diffstat (limited to 'src/tools/qml')
-rw-r--r-- | src/tools/qml/qmlobserver/qmlruntime.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/qml/qmlobserver/qmlruntime.cpp b/src/tools/qml/qmlobserver/qmlruntime.cpp index fbbeda6efeb..2894da2e355 100644 --- a/src/tools/qml/qmlobserver/qmlruntime.cpp +++ b/src/tools/qml/qmlobserver/qmlruntime.cpp @@ -55,7 +55,7 @@ #endif #include <qdeclarativeviewobserver.h> -#include <qdeclarativedesigndebugserver.h> +#include <qdeclarativeobserverservice.h> #include <utils/crumblepath.h> #include "qmlruntime.h" @@ -794,10 +794,10 @@ void QDeclarativeViewer::createMenu() designModeBehaviorAction->setShortcut(QKeySequence("Ctrl+D")); designModeBehaviorAction->setCheckable(true); designModeBehaviorAction->setChecked(observer->designModeBehavior()); - designModeBehaviorAction->setEnabled(QDeclarativeDesignDebugServer::hasDebuggingClient()); + designModeBehaviorAction->setEnabled(QDeclarativeObserverService::hasDebuggingClient()); connect(designModeBehaviorAction, SIGNAL(triggered(bool)), this, SLOT(setDesignModeBehavior(bool))); connect(observer, SIGNAL(designModeBehaviorChanged(bool)), designModeBehaviorAction, SLOT(setChecked(bool))); - connect(QDeclarativeDesignDebugServer::instance(), SIGNAL(debuggingClientChanged(bool)), designModeBehaviorAction, SLOT(setEnabled(bool))); + connect(QDeclarativeObserverService::instance(), SIGNAL(debuggingClientChanged(bool)), designModeBehaviorAction, SLOT(setEnabled(bool))); QAction *proxyAction = new QAction(tr("HTTP &Proxy..."), this); connect(proxyAction, SIGNAL(triggered()), this, SLOT(showProxySettings())); |