diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:48:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:50:16 +0100 |
| commit | a359bd756a98a0462bbd039d9b76981d73dc11f7 (patch) | |
| tree | 4917b25a005e75344a8f9ba60713ef5b4baa3533 /src/core/services/qtickclockservice.cpp | |
| parent | 3d30f6151c0c2884b1f15280301e552b5f67949c (diff) | |
| parent | 5a68874f7a2f18070890bec7c3259af94abe320b (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/doc/src/qt3dcollision-module.qdoc
src/render/frontend/qcamera.cpp
src/render/frontend/qcameralens.cpp
Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
Diffstat (limited to 'src/core/services/qtickclockservice.cpp')
| -rw-r--r-- | src/core/services/qtickclockservice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/services/qtickclockservice.cpp b/src/core/services/qtickclockservice.cpp index 8f29117e7..3691959ed 100644 --- a/src/core/services/qtickclockservice.cpp +++ b/src/core/services/qtickclockservice.cpp @@ -59,7 +59,7 @@ public: QTickClock m_clock; }; -/*! +/* !\internal \class Qt3DCore::QTickClockService \inmodule Qt3DCore \brief Default QAbstractFrameAdvanceService implementation. @@ -81,7 +81,7 @@ qint64 QTickClockService::waitForNextFrame() return d->m_clock.waitForNextTick(); } -/*! +/* Starts the inner tick clock used by the service. */ void QTickClockService::start() |