diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2020-06-01 10:04:44 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2020-06-01 10:36:56 +0300 |
| commit | b0699d699132d5132cf588e47b72e14d6fb307f8 (patch) | |
| tree | 601d9da0f28e070902843959dd7fb455f7ddf53f | |
| parent | d345c73e02968ca5f88d7b6ce4eef4e72cf1679d (diff) | |
Disable axis helperv2.7.0
Enabling axis helper causes a number of blocker bugs, so
it is too risky to include it this close to release.
Change-Id: Ic58922484228949ab9cf2f94c1ba536d7ab5e3ea
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
| -rw-r--r-- | src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp | 5 | ||||
| -rw-r--r-- | src/Authoring/Qt3DStudio/MainFrm.cpp | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp index c340ff32..f4157e7c 100644 --- a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp +++ b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp @@ -452,7 +452,10 @@ void CStudioPreferences::setHelperGridOn(bool showGrid) bool CStudioPreferences::isAxisHelperOn() { - return s_preferences.value(QStringLiteral("VisualAids/ShowAxisHelper"), true).toBool(); + return false; + // Disable axis helper (QT3DS-4122). To be re-enabled (QT3DS-4124), thoroughly tested + // and bugs fixed after 2.7 is released. + //return s_preferences.value(QStringLiteral("VisualAids/ShowAxisHelper"), true).toBool(); } void CStudioPreferences::setAxisHelperOn(bool showAxisHelper) diff --git a/src/Authoring/Qt3DStudio/MainFrm.cpp b/src/Authoring/Qt3DStudio/MainFrm.cpp index 8a868d23..377260c1 100644 --- a/src/Authoring/Qt3DStudio/MainFrm.cpp +++ b/src/Authoring/Qt3DStudio/MainFrm.cpp @@ -252,6 +252,10 @@ CMainFrame::CMainFrame() m_ui->actionToggle_hide_unhide_unselected->setVisible(false); m_ui->actionFind->setVisible(false); + // Hide axis helper (QT3DS-4122). To be re-enabled (QT3DS-4124), thoroughly tested and bugs + // fixed after 2.7 is released. + m_ui->actionAxis_Helper->setVisible(false); + // TODO: better solution? m_updateUITimer->start(500); connect(m_updateUITimer.data(), &QTimer::timeout, [&]() { |