diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-11-23 14:25:38 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-11-23 14:25:38 +0100 |
commit | 3f63635053a7870289dfe498c636efe67d988900 (patch) | |
tree | 723c4f258ad825314582c6b3bfdee0844d1acae5 /src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | |
parent | 22e3a7b3a4651a487f0e408a8aa255706337a689 (diff) | |
parent | 499589096a54181bfdbfad5bc2ba50dc945d0934 (diff) | |
download | qt-creator-3f63635053a7870289dfe498c636efe67d988900.tar.gz |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
src/plugins/git/gitplugin.cpp
Change-Id: I78a21510d484b655e01141a3543e08ee2123f9cd
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp')
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index 8945675e05..96b70100d7 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -104,16 +104,24 @@ void QmlProfilerTraceTime::setTime(qint64 startTime, qint64 endTime) void QmlProfilerTraceTime::decreaseStartTime(qint64 time) { - if (m_startTime > time) { + if (m_startTime > time || m_startTime == -1) { m_startTime = time; + if (m_endTime == -1) + m_endTime = m_startTime; + else + QTC_ASSERT(m_endTime >= m_startTime, m_endTime = m_startTime); emit timeChanged(time, m_endTime); } } void QmlProfilerTraceTime::increaseEndTime(qint64 time) { - if (m_endTime < time) { + if (m_endTime < time || m_endTime == -1) { m_endTime = time; + if (m_startTime == -1) + m_startTime = m_endTime; + else + QTC_ASSERT(m_endTime >= m_startTime, m_startTime = m_endTime); emit timeChanged(m_startTime, time); } } @@ -152,6 +160,8 @@ QmlProfilerModelManager::QmlProfilerModelManager(Utils::FileInProjectFinder *fin QObject(parent), d(new QmlProfilerModelManagerPrivate(this)) { d->totalWeight = 0; + d->previousProgress = 0; + d->progress = 0; d->availableFeatures = 0; d->visibleFeatures = 0; d->recordedFeatures = 0; |