summaryrefslogtreecommitdiffstats
path: root/src/api/studio3dqml/q3dsstudio3d_p.h
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2019-06-27 09:47:07 +0300
committerAntti Määttä <antti.maatta@qt.io>2019-06-28 09:31:22 +0300
commit9677851febf223cb3e74aa0d11edf95d0c08b919 (patch)
treecce42160d48e178e01fe7194da2e2f77b6219250 /src/api/studio3dqml/q3dsstudio3d_p.h
parent3a014b324f1948192cb973c62c40150464ce5aa2 (diff)
Fix simpleqml example
- Reset source when window changes because it will cause new renderer to be created and it would not have proper source without it. - Update the example codes and resources - Change how the init timer is initialized to get proper result each time the presentation gets reloaded. Task-number: QT3DS-3681 Change-Id: I64d4f6980b87b6efcbb906bb4ad241956ce0a7bc Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/api/studio3dqml/q3dsstudio3d_p.h')
-rw-r--r--src/api/studio3dqml/q3dsstudio3d_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/api/studio3dqml/q3dsstudio3d_p.h b/src/api/studio3dqml/q3dsstudio3d_p.h
index eed8459..0fa91d6 100644
--- a/src/api/studio3dqml/q3dsstudio3d_p.h
+++ b/src/api/studio3dqml/q3dsstudio3d_p.h
@@ -45,6 +45,7 @@
#include <QtStudio3D/private/q3dscommandqueue_p.h>
#include <QtGui/qopenglframebufferobject.h>
#include <QtQuick/qquickframebufferobject.h>
+#include <QtCore/qelapsedtimer.h>
QT_BEGIN_NAMESPACE
@@ -128,6 +129,7 @@ protected:
CommandQueue m_pendingCommands;
qreal m_pixelRatio;
QString m_error;
+ QScopedPointer<QElapsedTimer> m_startupTimer;
};
Q_DECLARE_OPERATORS_FOR_FLAGS(Q3DSStudio3D::EventIgnoreFlags)