From 1b5dd002c490dd15204279dc6659fe6e178d6224 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 8 Jul 2010 15:44:35 +0200
Subject: [PATCH] Compile with qt-qml.
---
src/plugins/qmljsinspector/qmljsclientproxy.cpp | 10 +++++-----
src/plugins/qmljsinspector/qmljsclientproxy.h | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.cpp b/src/plugins/qmljsinspector/qmljsclientproxy.cpp
index b5e22eb0e69..571d85c8e74 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.cpp
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.cpp
@@ -248,10 +248,10 @@ QList<QDeclarativeDebugObjectReference> ClientProxy::objectReferences(const QUrl
return result;
}
-QDeclarativeDebugExpressionQuery *ClientProxy::setBindingForObject(int objectDebugId,
- const QString &propertyName,
- const QVariant &value,
- bool isLiteralValue)
+bool ClientProxy::setBindingForObject(int objectDebugId,
+ const QString &propertyName,
+ const QVariant &value,
+ bool isLiteralValue)
{
qDebug() << Q_FUNC_INFO;
@@ -259,7 +259,7 @@ QDeclarativeDebugExpressionQuery *ClientProxy::setBindingForObject(int objectDeb
return 0;
qDebug() << "executeBinding():" << objectDebugId << propertyName << value << "isLiteral:" << isLiteralValue;
- return m_client->setBindingForObject(objectDebugId, propertyName, value.toString(), isLiteralValue, 0);
+ return m_client->setBindingForObject(objectDebugId, propertyName, value.toString(), isLiteralValue);
}
void ClientProxy::queryEngineContext(int id)
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.h b/src/plugins/qmljsinspector/qmljsclientproxy.h
index 26dc2164db3..4f5b5ef0dd0 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.h
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.h
@@ -55,10 +55,10 @@ class ClientProxy : public QObject
public:
static ClientProxy *instance();
- QDeclarativeDebugExpressionQuery *setBindingForObject(int objectDebugId,
- const QString &propertyName,
- const QVariant &value,
- bool isLiteralValue);
+ bool setBindingForObject(int objectDebugId,
+ const QString &propertyName,
+ const QVariant &value,
+ bool isLiteralValue);
// returns the object references for the given url.
QList<QDeclarativeDebugObjectReference> objectReferences(const QUrl &url = QUrl()) const;
--
GitLab