diff options
| author | Kaj Grönholm <kaj.gronholm@qt.io> | 2019-04-29 12:48:28 +0300 |
|---|---|---|
| committer | Kaj Grönholm <kaj.gronholm@qt.io> | 2019-04-29 10:59:49 +0000 |
| commit | 3d632fe7d4fd7d4f289bfbe276efd94a818865f9 (patch) | |
| tree | 514ac70e0bdc615b339be5f4ab932c4ec8cc6364 | |
| parent | 87477a7ed556e7ee575d4376d4d72026bd5ce3e1 (diff) | |
Set presentation id only when available
Don't set any default presentation id for Q3DSSurfaceViewer.
This way studio application uses filename as the presentation id
like before, keeping surfaceviewer autotests passing.
Task-number: QT3DS-3213
Change-Id: I461ec30fbf8e73b3b2f7fd433a849a2e600a74b8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/Viewer/studio3d/q3dssurfaceviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Viewer/studio3d/q3dssurfaceviewer.cpp b/src/Viewer/studio3d/q3dssurfaceviewer.cpp index c64ecbfc..c8090ea2 100644 --- a/src/Viewer/studio3d/q3dssurfaceviewer.cpp +++ b/src/Viewer/studio3d/q3dssurfaceviewer.cpp @@ -174,7 +174,6 @@ Q3DSSurfaceViewerPrivate::Q3DSSurfaceViewerPrivate(Q3DSSurfaceViewer *q) , m_autoSize(true) , m_settings(new Q3DSViewerSettings(this)) , m_presentation(new Q3DSPresentation(this)) - , m_id(QStringLiteral("initial")) { connect(m_presentation, &Q3DSPresentation::sourceChanged, this, &Q3DSSurfaceViewerPrivate::reset); @@ -378,7 +377,8 @@ bool Q3DSSurfaceViewerPrivate::initializeRuntime() return false; } - m_viewerApp->setPresentationId(m_id); + if (!m_id.isEmpty()) + m_viewerApp->setPresentationId(m_id); m_settings->d_ptr->setViewerApp(m_viewerApp); m_presentation->d_ptr->setViewerApp(m_viewerApp); |