diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
| commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
| tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /src/declarative/debugger/qdeclarativedebugtrace_p.h | |
| parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
| parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) | |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'src/declarative/debugger/qdeclarativedebugtrace_p.h')
| -rw-r--r-- | src/declarative/debugger/qdeclarativedebugtrace_p.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h index 8d15294d58..3ca529858d 100644 --- a/src/declarative/debugger/qdeclarativedebugtrace_p.h +++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** @@ -71,6 +71,7 @@ struct Q_AUTOTEST_EXPORT QDeclarativeDebugData //### QString detailData; //used by RangeData and RangeLocation int line; //used by RangeLocation + int column; //used by RangeLocation int framerate; //used by animation events int animationcount; //used by animation events @@ -125,8 +126,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 rangeLocation(RangeType, const QString &, int, int); + static void rangeLocation(RangeType, const QUrl &, int, int); static void endRange(RangeType); static void animationFrame(qint64); @@ -145,8 +146,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 rangeLocationImpl(RangeType, const QString &, int, int); + void rangeLocationImpl(RangeType, const QUrl &, int, int); void endRangeImpl(RangeType); void animationFrameImpl(qint64); |