diff options
author | Eike Ziller <[email protected]> | 2015-03-26 12:51:06 +0100 |
---|---|---|
committer | Eike Ziller <[email protected]> | 2015-03-26 12:51:06 +0100 |
commit | 65cd5381d96812546cb4b775785aa63483b4aa8c (patch) | |
tree | 7600dd967531cb75c614c9efbcce2f59df57de22 /src/plugins/qmlprofiler/qmlprofilertraceview.cpp | |
parent | cb5886139eb0f8558a946943f92c82ff971f8f19 (diff) | |
parent | 4846040e560dee7b3f38d667ec684f79e4c68758 (diff) |
Merge remote-tracking branch 'origin/3.4'
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilertraceview.cpp')
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index 0c4b3d431c9..cf4ec8131d8 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -171,18 +171,12 @@ bool QmlProfilerTraceView::hasValidSelection() const qint64 QmlProfilerTraceView::selectionStart() const { - QQuickItem *rootObject = d->m_mainView->rootObject(); - if (rootObject) - return rootObject->property("selectionRangeStart").toLongLong(); - return 0; + return d->m_zoomControl->selectionStart(); } qint64 QmlProfilerTraceView::selectionEnd() const { - QQuickItem *rootObject = d->m_mainView->rootObject(); - if (rootObject) - return rootObject->property("selectionRangeEnd").toLongLong(); - return 0; + return d->m_zoomControl->selectionEnd(); } void QmlProfilerTraceView::clear() |