diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:21:56 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:21:56 +0100 |
| commit | d8c559c4e2fc0b8051be78bd64b8a8fe80b3b78f (patch) | |
| tree | 8af3738bb802fb064cb81352818a172b7c24e21a /src/quick/scenegraph/qsgthreadedrenderloop_p.h | |
| parent | 4d8b9373c62b9b58c54548f41f1e9d84e9522c6e (diff) | |
| parent | c3effc6cd3a66b6c02048d8ad85c7ed3bb3c1463 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/qml/jsruntime/qv4numberobject.cpp
Change-Id: I4e66a03ef4d99cec192c9da30c028fd8c1f4ac0d
Diffstat (limited to 'src/quick/scenegraph/qsgthreadedrenderloop_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop_p.h b/src/quick/scenegraph/qsgthreadedrenderloop_p.h index f371efc1a1..d5ffbf10a3 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop_p.h +++ b/src/quick/scenegraph/qsgthreadedrenderloop_p.h @@ -49,6 +49,7 @@ class QSGThreadedRenderLoop : public QSGRenderLoop Q_OBJECT public: QSGThreadedRenderLoop(); + ~QSGThreadedRenderLoop(); void show(QQuickWindow *) {} void hide(QQuickWindow *); |