summaryrefslogtreecommitdiffstats
path: root/src/declarative/debugger
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-04-18 11:43:25 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-18 11:47:06 +0200
commitd2e40f5dbd6d1a550bc70a7adb8511788eeca031 (patch)
tree566f5dabad389971e6d6f73ba5b8f8aad498552f /src/declarative/debugger
parent6d8f3821a2ff621a3f34074399864b6d75daf654 (diff)
Fix compilation and tests after qtbase/api_changes merge
Adapt to QUrl changes, based on how qtdeclarative was adapted in commit 2d393ae042d5badf0862c0f95122f9662042f2a9. Change-Id: I9d1fddf4bbc6d86ac206dca4ac929d180ec12efa Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/declarative/debugger')
-rw-r--r--src/declarative/debugger/qdeclarativedebugtrace.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp
index c1206a2c..e255edd5 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp
@@ -149,7 +149,7 @@ void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &rData)
if (status() != Enabled || !m_enabled)
return;
- QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData.toString(QUrl::FormattingOption(0x100)), -1};
+ QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData.toString(QUrl::UrlFormattingOption(0x100)), -1};
processMessage(rd);
}
@@ -167,7 +167,7 @@ void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QUrl &file
if (status() != Enabled || !m_enabled)
return;
- QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::FormattingOption(0x100)), line};
+ QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::UrlFormattingOption(0x100)), line};
processMessage(rd);
}