QmlJSDebugger: Merge back changes done to the files in qtdeclarative

Change-Id: I722b191035757c60ce103edf74517f5348a91955
Reviewed-on: http://codereview.qt.nokia.com/3945
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2011-08-31 12:55:08 +02:00
parent 7fa9e52d70
commit 1bca3e966d
6 changed files with 83 additions and 18 deletions

View File

@@ -39,7 +39,6 @@ class QDeclarativeEngineDebugClient : public QDeclarativeDebugClient
{
public:
QDeclarativeEngineDebugClient(QDeclarativeDebugConnection *client, QDeclarativeEngineDebugPrivate *p);
~QDeclarativeEngineDebugClient();
protected:
virtual void statusChanged(Status status);
@@ -88,10 +87,6 @@ QDeclarativeEngineDebugClient::QDeclarativeEngineDebugClient(QDeclarativeDebugCo
{
}
QDeclarativeEngineDebugClient::~QDeclarativeEngineDebugClient()
{
}
void QDeclarativeEngineDebugClient::statusChanged(Status status)
{
if (priv)
@@ -445,7 +440,9 @@ QDeclarativeEngineDebug::QDeclarativeEngineDebug(QDeclarativeDebugConnection *cl
{
}
QDeclarativeEngineDebug::~QDeclarativeEngineDebug() { }
QDeclarativeEngineDebug::~QDeclarativeEngineDebug()
{
}
QDeclarativeEngineDebug::Status QDeclarativeEngineDebug::status() const
{