Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

7 files changed, 36 insertions, 15 deletions

diff --git a/src/declarative/qml/qmldeclarativedata_p.h b/src/declarative/qml/qmldeclarativedata_p.h
index 5a51eb7..a316c0c 100644
--- a/src/declarative/qml/qmldeclarativedata_p.h
+++ b/src/declarative/qml/qmldeclarativedata_p.h
@@ -59,6 +59,7 @@ QT_BEGIN_NAMESPACE
 
 class QmlCompiledData;
 class QmlAbstractBinding;
+class QmlContext;
 class QmlDeclarativeData : public QDeclarativeData
 {
 public:
@@ -69,6 +70,10 @@ public:
     QmlContext *context;
     QmlAbstractBinding *bindings;
 
+    QmlContext *outerContext; // Can't this be found from context?
+    ushort lineNumber;
+    ushort columnNumber;
+
     QmlCompiledData *deferredComponent; // Can't this be found from the context?
     unsigned int deferredIdx;
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 0bd3931..e342d3f 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -108,7 +108,7 @@ QScriptValue desktopOpenUrl(QScriptContext *ctxt, QScriptEngine *e)
 }
 
 QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
-: rootContext(0), currentBindContext(0), currentExpression(0),
+: rootContext(0), currentExpression(0),
   isDebugging(false), contextClass(0), objectClass(0), valueTypeClass(0),
   nodeListClass(0), namedNodeMapClass(0), scriptEngine(this), rootComponent(0),
   networkAccessManager(0), typeManager(e), uniqueId(1)
@@ -206,13 +206,6 @@ void QmlEnginePrivate::init()
     }
 }
 
-QmlContext *QmlEnginePrivate::setCurrentBindContext(QmlContext *c)
-{
-    QmlContext *old = currentBindContext;
-    currentBindContext = c;
-    return old;
-}
-
 QmlEnginePrivate::CapturedProperty::CapturedProperty(const QmlMetaProperty &p)
 : object(p.object()), coreIndex(p.coreIndex()), notifyIndex(p.property().notifySignalIndex())
 {
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 1e251cc..a33add3 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -114,7 +114,6 @@ public:
     QPODVector<CapturedProperty> capturedProperties;
 
     QmlContext *rootContext;
-    QmlContext *currentBindContext; // ### Remove me
     QmlExpression *currentExpression;
     bool isDebugging;
 #ifdef QT_SCRIPTTOOLS_LIB
@@ -128,9 +127,6 @@ public:
     QScriptClass *nodeListClass;
     QScriptClass *namedNodeMapClass;
 
-    QmlContext *setCurrentBindContext(QmlContext *);
-    QStack<QmlContext *> activeContexts; // ### Remove me
-
     struct QmlScriptEngine : public QScriptEngine
     {
         QmlScriptEngine(QmlEnginePrivate *priv)
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 0e78cad..321fe74 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -181,9 +181,16 @@ void QmlEngineDebugServer::buildObjectList(QDataStream &message,
 QmlEngineDebugServer::QmlObjectData 
 QmlEngineDebugServer::objectData(QObject *object)
 {
+    QmlDeclarativeData *ddata = QmlDeclarativeData::get(object);
     QmlObjectData rv;
-    rv.lineNumber = -1;
-    rv.columnNumber = -1;
+    if (ddata) {
+        rv.url = ddata->outerContext->baseUrl();
+        rv.lineNumber = ddata->lineNumber;
+        rv.columnNumber = ddata->columnNumber;
+    } else {
+        rv.lineNumber = -1;
+        rv.columnNumber = -1;
+    }
 
     rv.objectName = object->objectName();
     rv.objectType = object->metaObject()->className();
diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp
index 65a4298..e47b4ab 100644
--- a/src/declarative/qml/qmlinfo.cpp
+++ b/src/declarative/qml/qmlinfo.cpp
@@ -40,6 +40,8 @@
 ****************************************************************************/
 
 #include "qmlinfo.h"
+#include <private/qmldeclarativedata_p.h>
+#include <QtDeclarative/qmlcontext.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -80,7 +82,19 @@ QmlInfo::QmlInfo(QObject *object)
     *this << "QML";
     if (object) 
         *this << object->metaObject()->className();
-    *this << "(unknown location):";
+    QmlDeclarativeData *ddata = QmlDeclarativeData::get(object);
+    if (ddata) {
+        QString location = QLatin1String("(");
+        location += ddata->outerContext->baseUrl().toString();
+        location += QLatin1String(":");
+        location += QString::number(ddata->lineNumber);
+        location += QLatin1String(":");
+        location += QString::number(ddata->columnNumber);
+        location += QLatin1String(")");
+        *this << location.toLatin1().constData();
+    } else {
+        *this << "(unknown location):";
+    }
 }
 
 /*!
diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h
index 8861609a..ede06a2 100644
--- a/src/declarative/qml/qmlinstruction_p.h
+++ b/src/declarative/qml/qmlinstruction_p.h
@@ -170,6 +170,7 @@ public:
         struct {
             int type;
             int data;
+            ushort column;
         } create;
         struct {
             int data;
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index 930e6e4..7907195 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -174,6 +174,11 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData
                     VME_EXCEPTION("Unable to create object of type" << types.at(instr.create.type).className);
                 }
 
+                QmlDeclarativeData *ddata = QmlDeclarativeData::get(o);
+                ddata->outerContext = ctxt;
+                ddata->lineNumber = instr.line;
+                ddata->columnNumber = instr.create.column;
+
                 if (instr.create.data != -1) {
                     QmlCustomParser *customParser =
                         types.at(instr.create.type).type->customParser();