2 files changed, 46 insertions, 8 deletions

diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp
index 9fa1f5b..4bad405 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp
@@ -58,6 +58,8 @@ QByteArray QDeclarativeDebugData::toByteArray() const
     ds << time << messageType << detailType;
     if (messageType == (int)QDeclarativeDebugTrace::RangeData)
         ds << detailData;
+    if (messageType == (int)QDeclarativeDebugTrace::RangeLocation)
+        ds << detailData << line;
     return data;
 }
 
@@ -92,6 +94,18 @@ void QDeclarativeDebugTrace::rangeData(RangeType t, const QUrl &data)
         traceInstance()->rangeDataImpl(t, data);
 }
 
+void QDeclarativeDebugTrace::rangeLocation(RangeType t, const QString &fileName, int line)
+{
+    if (QDeclarativeDebugService::isDebuggingEnabled())
+        traceInstance()->rangeLocationImpl(t, fileName, line);
+}
+
+void QDeclarativeDebugTrace::rangeLocation(RangeType t, const QUrl &fileName, int line)
+{
+    if (QDeclarativeDebugService::isDebuggingEnabled())
+        traceInstance()->rangeLocationImpl(t, fileName, line);
+}
+
 void QDeclarativeDebugTrace::endRange(RangeType t)
 {
     if (QDeclarativeDebugService::isDebuggingEnabled()) 
@@ -103,7 +117,7 @@ void QDeclarativeDebugTrace::addEventImpl(EventType event)
     if (status() != Enabled || !m_enabled)
         return;
 
-    QDeclarativeDebugData ed = {m_timer.elapsed(), (int)Event, (int)event, QString()};
+    QDeclarativeDebugData ed = {m_timer.elapsed(), (int)Event, (int)event, QString(), -1};
     processMessage(ed);
 }
 
@@ -112,7 +126,7 @@ void QDeclarativeDebugTrace::startRangeImpl(RangeType range)
     if (status() != Enabled || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeStart, (int)range, QString()};
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeStart, (int)range, QString(), -1};
     processMessage(rd);
 }
 
@@ -121,7 +135,7 @@ void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QString &rData
     if (status() != Enabled || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData};
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData, -1};
     processMessage(rd);
 }
 
@@ -130,7 +144,25 @@ void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &rData)
     if (status() != Enabled || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData.toEncoded(QUrl::FormattingOption(0x100))};
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData.toEncoded(QUrl::FormattingOption(0x100)), -1};
+    processMessage(rd);
+}
+
+void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QString &fileName, int line)
+{
+    if (status() != Enabled || !m_enabled)
+        return;
+
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeLocation, (int)range, fileName, line};
+    processMessage(rd);
+}
+
+void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QUrl &fileName, int line)
+{
+    if (status() != Enabled || !m_enabled)
+        return;
+
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeLocation, (int)range, fileName.toEncoded(QUrl::FormattingOption(0x100)), line};
     processMessage(rd);
 }
 
@@ -139,7 +171,7 @@ void QDeclarativeDebugTrace::endRangeImpl(RangeType range)
     if (status() != Enabled || !m_enabled)
         return;
 
-    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeEnd, (int)range, QString()};
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeEnd, (int)range, QString(), -1};
     processMessage(rd);
 }
 
diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h
index 39268fe..ae0653e 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace_p.h
+++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h
@@ -54,13 +54,14 @@ struct QDeclarativeDebugData
     qint64 time;
     int messageType;
     int detailType;
-    QString detailData;
+
+    //###
+    QString detailData; //used by RangeData and RangeLocation
+    int line;           //used by RangeLocation
 
     QByteArray toByteArray() const;
 };
 
-Q_DECLARE_TYPEINFO(QDeclarativeDebugData,Q_PRIMITIVE_TYPE);
-
 class QUrl;
 class Q_AUTOTEST_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService
 {
@@ -69,6 +70,7 @@ public:
         Event,
         RangeStart,
         RangeData,
+        RangeLocation,
         RangeEnd,
         Complete,
 
@@ -98,6 +100,8 @@ public:
     static void startRange(RangeType);
     static void rangeData(RangeType, const QString &);
     static void rangeData(RangeType, const QUrl &);
+    static void rangeLocation(RangeType, const QString &, int);
+    static void rangeLocation(RangeType, const QUrl &, int);
     static void endRange(RangeType);
 
     QDeclarativeDebugTrace();
@@ -108,6 +112,8 @@ private:
     void startRangeImpl(RangeType);
     void rangeDataImpl(RangeType, const QString &);
     void rangeDataImpl(RangeType, const QUrl &);
+    void rangeLocationImpl(RangeType, const QString &, int);
+    void rangeLocationImpl(RangeType, const QUrl &, int);
     void endRangeImpl(RangeType);
     void processMessage(const QDeclarativeDebugData &);
     void sendMessages();