From 5578d47e1a8a7afac027e6aa27f630d6bff727ca Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 24 Sep 2019 16:09:00 +0300 Subject: Remove qt3d-runtime dependencies from studio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QT3DS-3958 Change-Id: I1542cf2c78eb54fcff42598118cf19acb5ad66d7 Reviewed-by: Mahmoud Badri Reviewed-by: Tomi Korpipää --- .gitmodules | 3 --- doc/src/03-studio/0-menu.qdoc | 4 ---- doc/src/03-studio/1-toolbar.qdoc | 4 ---- doc/src/04-viewer/2-commandline.qdoc | 2 +- doc/src/04-viewer/3-remote-deployment.qdoc | 2 +- doc/style/qt5-sidebar.html | 12 ---------- qt3dstudio.pro | 27 ---------------------- .../Client/Code/Core/Utility/StudioPreferences.cpp | 10 -------- .../Client/Code/Core/Utility/StudioPreferences.h | 3 --- src/Authoring/Qt3DStudio/MainFrm.cpp | 16 ------------- src/Authoring/Qt3DStudio/MainFrm.h | 1 - src/Authoring/Qt3DStudio/MainFrm.ui | 16 ------------- src/Authoring/Qt3DStudio/PreviewHelper.cpp | 26 ++++++--------------- src/Authoring/Qt3DStudio/UI/StudioAppPrefsPage.cpp | 9 -------- src/Authoring/Qt3DStudio/UI/StudioAppPrefsPage.ui | 13 +++-------- src/Runtime/Runtime.pro | 20 +--------------- src/Runtime/qt3d-runtime | 1 - 17 files changed, 13 insertions(+), 156 deletions(-) delete mode 160000 src/Runtime/qt3d-runtime diff --git a/.gitmodules b/.gitmodules index 3d43dde3..aad74655 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "src/3rdparty/pcre"] path = src/3rdparty/pcre url = ../qt3dstudio-pcre.git -[submodule "src/Runtime/qt3d-runtime"] - path = src/Runtime/qt3d-runtime - url = ../qt3d-runtime.git [submodule "src/Runtime/ogl-runtime"] path = src/Runtime/ogl-runtime url = ../ogl-runtime diff --git a/doc/src/03-studio/0-menu.qdoc b/doc/src/03-studio/0-menu.qdoc index f1359cf2..fecaff8b 100644 --- a/doc/src/03-studio/0-menu.qdoc +++ b/doc/src/03-studio/0-menu.qdoc @@ -116,10 +116,6 @@ \li \uicontrol{Timeline Snapping Grid} - When using snapping in the timeline, controls which ticks to snap to. - \li - \uicontrol{Legacy Viewer} - Enables the legacy viewer preview button in the toolbar. Legacy - viewer uses Runtime from Qt 3D Studio 1.1, whereas the default viewer uses Runtime from - Qt 3D Studio 2.0. Requires a restart. \endlist \li \uicontrol{Editing View} diff --git a/doc/src/03-studio/1-toolbar.qdoc b/doc/src/03-studio/1-toolbar.qdoc index 98a5400a..8f3e8a5d 100644 --- a/doc/src/03-studio/1-toolbar.qdoc +++ b/doc/src/03-studio/1-toolbar.qdoc @@ -253,10 +253,6 @@ The preview toolbar buttons are used to preview your presentation. The \b{Remote Preview} button (keyboard shortcut: \c{F6})will launch the presentation on the connected remote device Qt 3D Studio Viewer application. This button is only enabled if you are connected to a remote device. - \li - The \b{Preview with Qt 3D Runtime} button - will launch the Qt 3D Runtime Viewer application and preview the - application for the presentation. \endlist \note If there is no \c{.uia} file in the folder for the presentation, then the diff --git a/doc/src/04-viewer/2-commandline.qdoc b/doc/src/04-viewer/2-commandline.qdoc index e45a0e78..3c78a29a 100644 --- a/doc/src/04-viewer/2-commandline.qdoc +++ b/doc/src/04-viewer/2-commandline.qdoc @@ -37,7 +37,7 @@ for incoming connections with a presentation sent remotely. \section1 Usage \badcode - q3dsviewer [options] [presentation file] + Qt3DViewer [options] [presentation file] \endcode When no filename is given, the viewer is launched in remote connection mode. diff --git a/doc/src/04-viewer/3-remote-deployment.qdoc b/doc/src/04-viewer/3-remote-deployment.qdoc index d2379546..b9da5e8f 100644 --- a/doc/src/04-viewer/3-remote-deployment.qdoc +++ b/doc/src/04-viewer/3-remote-deployment.qdoc @@ -59,7 +59,7 @@ For embedded systems you will have to compile the application on the target devi You can run the Viewer from the command line. The default mode is connection mode. To start the Viewer, use the following command: \badcode -q3dsviewer +Qt3DViewer \endcode When you run the Viewer in connection mode it will display connection details, IP address and port, diff --git a/doc/style/qt5-sidebar.html b/doc/style/qt5-sidebar.html index 822add38..0259d2ca 100644 --- a/doc/style/qt5-sidebar.html +++ b/doc/style/qt5-sidebar.html @@ -13,18 +13,6 @@ -
-
-

Qt 3D Runtime

-
-
- -
-

OpenGL Runtime

diff --git a/qt3dstudio.pro b/qt3dstudio.pro index 56e18268..e1c60dd8 100644 --- a/qt3dstudio.pro +++ b/qt3dstudio.pro @@ -99,33 +99,6 @@ load(qt_parts) $$DEPLOY_TOOL $$shell_quote(\$(DEPLOY_DIR)/Qt3DViewer$${exesuffix}) \ $$EXTRA_DEPLOY_OPTIONS } - - greaterThan(QT_MAJOR_VERSION, 5)|greaterThan(QT_MINOR_VERSION, 10) { - # Viewer 2.0 - win32 { - # Viewer 2.0 has similar issues with dependent library naming as viewer 1.0, - # but it only has one library that is causing problems and no qml (so far), - # so lets just copy the problem lib over to where windeployqt can find it, - # i.e. under Qt's bin dir. This pollutes the Qt's bin dir a bit, but as the main - # use case for this is gathering installer content in CI after everything is - # already built, this shouldn't be a problem. - release { - RUNTIME2_LIB = Qt53DStudioRuntime2$${QT_LIBINFIX}.dll - } else { - RUNTIME2_LIB = Qt53DStudioRuntime2$${QT_LIBINFIX}d.dll - } - QMAKE_EXTRA_TARGETS += copyRuntime2 - deployTarget.depends += copyRuntime2 - copyRuntime2.commands = \ - $$QMAKE_COPY $$shell_quote($$shell_path( \ - $$OUT_PWD/src/Runtime/qt3d-runtime/bin/$$RUNTIME2_LIB)) \ - $$shell_quote($$shell_path($$[QT_INSTALL_BINS]/$$RUNTIME2_LIB)) - } - - deployTarget.commands += && \ - $$DEPLOY_TOOL $$shell_quote(\$(DEPLOY_DIR)/q3dsviewer$${exesuffix}) \ - $$EXTRA_DEPLOY_OPTIONS - } } else { # Create a dummy target for other platforms deployTarget.commands = @echo deployqt target is not supported for this platform. diff --git a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp index bde1da0c..9068de60 100644 --- a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp +++ b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp @@ -230,16 +230,6 @@ void CStudioPreferences::resetWindowState(int version) // Viewing settings // -bool CStudioPreferences::isLegacyViewerActive() -{ - return s_preferences.value(QStringLiteral("Viewing/LegacyViewerActive"), false).toBool(); -} - -void CStudioPreferences::setLegacyViewerActive(bool inActive) -{ - s_preferences.setValue(QStringLiteral("Viewing/LegacyViewerActive"), inActive); -} - bool CStudioPreferences::isEditViewFillMode() { return s_preferences.value(QStringLiteral("Viewing/EditViewFillMode"), true).toBool(); diff --git a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.h b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.h index 490a48cc..0b72ee7f 100644 --- a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.h +++ b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.h @@ -67,9 +67,6 @@ public: // Viewing settings // - static bool isLegacyViewerActive(); - static void setLegacyViewerActive(bool inActive); - static bool isEditViewFillMode(); static void setEditViewFillMode(bool inRenderAsSolid); diff --git a/src/Authoring/Qt3DStudio/MainFrm.cpp b/src/Authoring/Qt3DStudio/MainFrm.cpp index e59b7c1c..d4f5a32c 100644 --- a/src/Authoring/Qt3DStudio/MainFrm.cpp +++ b/src/Authoring/Qt3DStudio/MainFrm.cpp @@ -218,16 +218,6 @@ CMainFrame::CMainFrame() connect(m_ui->actionRemote_Preview, &QAction::triggered, this, &CMainFrame::OnPlaybackPreviewRemote); - // Only show Qt3D runtime preview if we have appropriate viewer and it's enabled - if (CStudioPreferences::isLegacyViewerActive() - && QFileInfo(CPreviewHelper::getViewerFilePath(QStringLiteral("q3dsviewer"))).exists()) { - connect(m_ui->actionPreviewQt3DRuntime, &QAction::triggered, - this, &CMainFrame::OnPlaybackPreviewQt3DRuntime); - m_ui->actionPreviewQt3DRuntime->setVisible(true); - } else { - m_ui->actionPreviewQt3DRuntime->setVisible(false); - } - // Tool mode toolbar connect(m_ui->actionPosition_Tool, &QAction::triggered, this, std::bind(&CMainFrame::onTransformToolChanged, this, STUDIO_TOOLMODE_MOVE)); @@ -896,7 +886,6 @@ void CMainFrame::EditPreferences(short inPageIndex) CStudioPreferences::setDontShowGLVersionDialog(false); CStudioPreferences::setDefaultClientSize(CStudioPreferences::DEFAULT_CLIENT_WIDTH, CStudioPreferences::DEFAULT_CLIENT_HEIGHT); - CStudioPreferences::setLegacyViewerActive(true); CStudioPreferences::setEditViewFillMode(true); CStudioPreferences::setPreferredStartupView( CStudioPreferences::PREFERREDSTARTUP_DEFAULTINDEX); @@ -1032,11 +1021,6 @@ void CMainFrame::OnPlaybackPreview(const QString &viewerExeName, bool remote) } } -void CMainFrame::OnPlaybackPreviewQt3DRuntime() -{ - OnPlaybackPreview(QStringLiteral("q3dsviewer")); -} - void CMainFrame::OnPlaybackPreviewOpenGLRuntime() { OnPlaybackPreview(QStringLiteral("Qt3DViewer")); diff --git a/src/Authoring/Qt3DStudio/MainFrm.h b/src/Authoring/Qt3DStudio/MainFrm.h index 52c23be4..f25540ec 100644 --- a/src/Authoring/Qt3DStudio/MainFrm.h +++ b/src/Authoring/Qt3DStudio/MainFrm.h @@ -144,7 +144,6 @@ public: void OnPlaybackRewind(); void OnPlaybackStop(); void OnPlaybackPreview(const QString &viewerExeName, bool remote = false); - void OnPlaybackPreviewQt3DRuntime(); void OnPlaybackPreviewOpenGLRuntime(); void OnPlaybackPreviewRemote(); void onFilterVariants(); diff --git a/src/Authoring/Qt3DStudio/MainFrm.ui b/src/Authoring/Qt3DStudio/MainFrm.ui index 26f9cff9..553659dc 100644 --- a/src/Authoring/Qt3DStudio/MainFrm.ui +++ b/src/Authoring/Qt3DStudio/MainFrm.ui @@ -275,7 +275,6 @@ Project palette using Import functionality. - @@ -875,21 +874,6 @@ Project palette using Import functionality. false - - - - :/images/playback_tools_play.png:/images/playback_tools_play.png - - - Preview with Qt3D Runtime Viewer - - - Preview with Qt3D Runtime Viewer - - - Preview with Qt3D Runtime Viewer - - Import... diff --git a/src/Authoring/Qt3DStudio/PreviewHelper.cpp b/src/Authoring/Qt3DStudio/PreviewHelper.cpp index 1e87201b..24d7ee91 100644 --- a/src/Authoring/Qt3DStudio/PreviewHelper.cpp +++ b/src/Authoring/Qt3DStudio/PreviewHelper.cpp @@ -118,21 +118,14 @@ QString CPreviewHelper::getViewerFilePath(const QString &exeName) viewerFile = QStringLiteral("%1.exe").arg(exeName); QString viewer = viewerDir.filePath() + QStringLiteral("/") + viewerFile; - if (!QFileInfo(viewer).exists()) { - if (exeName == QLatin1String("q3dsviewer")) { - viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/qt3d-runtime/bin/") - + viewerFile; - } else if (exeName == QLatin1String("Qt3DViewer")) { - viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/ogl-runtime/bin/") - + viewerFile; - } + if (!QFileInfo(viewer).exists() && exeName == QLatin1String("Qt3DViewer")) { + viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/ogl-runtime/bin/") + + viewerFile; } #else #ifdef Q_OS_MACOS QString viewerDevPath; - if (exeName == QLatin1String("q3dsviewer")) - viewerDevPath = QStringLiteral("../src/Runtime/qt3d-runtime/bin/"); - else if (exeName == QLatin1String("Qt3DViewer")) + if (exeName == QLatin1String("Qt3DViewer")) viewerDevPath = QStringLiteral("../src/Runtime/ogl-runtime/bin/"); // Name of the executable file on macOS @@ -155,14 +148,9 @@ QString CPreviewHelper::getViewerFilePath(const QString &exeName) viewerFile = exeName; QString viewer = viewerDir.filePath() + QStringLiteral("/") + viewerFile; - if (!QFileInfo(viewer).exists()) { - if (exeName == QLatin1String("q3dsviewer")) { - viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/qt3d-runtime/bin/") - + viewerFile; - } else if (exeName == QLatin1String("Qt3DViewer")) { - viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/ogl-runtime/bin/") - + viewerFile; - } + if (!QFileInfo(viewer).exists() && exeName == QLatin1String("Qt3DViewer")) { + viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/ogl-runtime/bin/") + + viewerFile; } #endif #endif diff --git a/src/Authoring/Qt3DStudio/UI/StudioAppPrefsPage.cpp b/src/Authoring/Qt3DStudio/UI/StudioAppPrefsPage.cpp index df918d19..e6786e4a 100644 --- a/src/Authoring/Qt3DStudio/UI/StudioAppPrefsPage.cpp +++ b/src/Authoring/Qt3DStudio/UI/StudioAppPrefsPage.cpp @@ -90,7 +90,6 @@ void CStudioAppPrefsPage::onInitDialog() // Add tool tips for controls m_ui->m_DefaultInterpolation->setToolTip(tr("Set default keyframe interpolation type")); m_ui->m_checkTimelineAbsoluteSnapping->setToolTip(tr("Enable timeline snapping grid")); - m_ui->m_checkLegacyViewer->setToolTip(tr("Enable preview with Qt3D Runtime Viewer")); m_ui->m_SnapRangeCombo->setToolTip(tr("Set resolution of timeline snapping grid")); m_ui->m_buttonRestoreDefaults->setToolTip(tr("Click to restore default Studio settings")); @@ -119,8 +118,6 @@ void CStudioAppPrefsPage::onInitDialog() connect(m_ui->m_SnapRangeCombo, activated, this, [=](){ setModified(true); }); connect(m_ui->m_checkTimelineAbsoluteSnapping, &QCheckBox::clicked, this, [=](){ setModified(true); enableOptions(); }); - connect(m_ui->m_checkLegacyViewer, &QCheckBox::clicked, - this, [=](){ setModified(true); m_restartNeeded = true; }); connect(m_ui->m_EditViewStartupView, activated, this, [=](){ setModified(true); }); connect(m_ui->helperGridLinesSpinBox, static_cast(&QSpinBox::valueChanged), @@ -170,9 +167,6 @@ void CStudioAppPrefsPage::loadSettings() m_ui->m_checkTimelineAbsoluteSnapping->setChecked( CStudioPreferences::isTimelineSnappingGridActive()); - // Legacy viewer - m_ui->m_checkLegacyViewer->setChecked(CStudioPreferences::isLegacyViewerActive()); - // Helper grid m_ui->helperGridLinesSpinBox->setValue(CStudioPreferences::helperGridLines()); m_ui->helperGridSpacingSpinBox->setValue(CStudioPreferences::helperGridSpacing()); @@ -220,9 +214,6 @@ void CStudioAppPrefsPage::saveSettings() int theCurrentSelection = m_ui->m_SnapRangeCombo->currentIndex(); CStudioPreferences::setTimelineSnappingGridResolution(ESnapGridResolution(theCurrentSelection)); - // Viewing settings - // Legacy viewer - CStudioPreferences::setLegacyViewerActive(m_ui->m_checkLegacyViewer->isChecked()); // Preferred Startup View CStudioPreferences::setPreferredStartupView(m_ui->m_EditViewStartupView->currentIndex()); diff --git a/src/Authoring/Qt3DStudio/UI/StudioAppPrefsPage.ui b/src/Authoring/Qt3DStudio/UI/StudioAppPrefsPage.ui index d9187726..3edd65dc 100644 --- a/src/Authoring/Qt3DStudio/UI/StudioAppPrefsPage.ui +++ b/src/Authoring/Qt3DStudio/UI/StudioAppPrefsPage.ui @@ -30,6 +30,9 @@ + + + @@ -40,9 +43,6 @@ - - - @@ -50,13 +50,6 @@ - - - - Qt3D Viewer - - - diff --git a/src/Runtime/Runtime.pro b/src/Runtime/Runtime.pro index eba449a2..8b07be9d 100644 --- a/src/Runtime/Runtime.pro +++ b/src/Runtime/Runtime.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += \ - ogl-runtime \ +SUBDIRS += ogl-runtime # HACK to ensure syncqt is run for ogl-runtime if one is run for studio # This is necessary because CI doesn't create dummy .git directories for submodules @@ -13,20 +12,3 @@ if(!build_pass|!debug_and_release) { $$system("$$MAKE_DIR_CMD") } } - - -# Qt3D based runtime needs Qt 5.11 or later -greaterThan(QT_MAJOR_VERSION, 5)|greaterThan(QT_MINOR_VERSION, 10) { - SUBDIRS += qt3d-runtime - - # HACK to ensure syncqt is run for qt3d-runtime if one is run for studio - # This is necessary because CI doesn't create dummy .git directories for submodules - if(!build_pass|!debug_and_release) { - # Pro file existence is checked to ensure we don't create dummy .git in empty submodule dir, - # which happens when studio is cloned without --recursive option - exists($$PWD/../../.git):!exists($$PWD/qt3d-runtime/.git):exists($$PWD/qt3d-runtime/qt3d-runtime.pro) { - MAKE_DIR_CMD = $$sprintf($$QMAKE_MKDIR_CMD, $$shell_quote($$shell_path($$PWD/qt3d-runtime/.git))) - $$system("$$MAKE_DIR_CMD") - } - } -} diff --git a/src/Runtime/qt3d-runtime b/src/Runtime/qt3d-runtime deleted file mode 160000 index bd083f50..00000000 --- a/src/Runtime/qt3d-runtime +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd083f50691e35ac0ab572ebc92fe15dae2f2989 -- cgit v1.2.3