feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJSDebugger: Rename QDDesignServer to QDObserverService

Browse Source 
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.
This commit is contained in:
Kai Koehne
2010-09-16 12:29:06 +02:00
parent d1f1d44c28
commit bf3be741fd
7 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/qml/qmlobserver/qmlruntime.cpp
View File

@@ -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()));