diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:27:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:27:57 +0200 |
| commit | 198409ba76e18587526e9e1ec84fdb432c671937 (patch) | |
| tree | 2d06c052272ddfd1c9b34b863e342826a31d20b9 /src/quick/scenegraph/adaptations | |
| parent | 9a98d16d9e49395a24cd733ca8f65b2f82ebba94 (diff) | |
| parent | e696a6b7bff04d1581cf59b4d96ecb5508f54169 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
tests/auto/qml/qjsengine/tst_qjsengine.cpp
Change-Id: I8276669e257f35a76768ef7f8795a8605cf4c9bc
Diffstat (limited to 'src/quick/scenegraph/adaptations')
| -rw-r--r-- | src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp index 423f5f7321..b400473128 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp @@ -195,7 +195,7 @@ void QSGSoftwareRenderLoop::renderWindow(QQuickWindow *window, bool isNewExpose) int(polishTime / 1000000), int((syncTime - polishTime) / 1000000), int((renderTime - syncTime) / 1000000), - int((swapTime - renderTime) / 10000000), + int((swapTime - renderTime) / 1000000), int(lastFrameTime.msecsTo(QTime::currentTime()))); lastFrameTime = QTime::currentTime(); } |