diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-09-05 11:58:37 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-09-05 10:31:37 +0000 |
| commit | ef967b211331f7a45f9f49e9eadc3e49ee95da11 (patch) | |
| tree | a2af8eee233954fa0efa3dfca297589951ace7f2 /src/Authoring/Studio/Palettes | |
| parent | c83d99936d37c7e30bf30524bb066478db84cf4e (diff) | |
Fix newline on inspector tooltips
Datainput tooltip handling was overriding property tooltip.
Datainput in use is now shown clearly in UI, so no need to hijack
the tooltip for that.
Task-number: QT3DS-2265
Change-Id: I05f3accb8d3fffe1a3be4ff4a6c8024248aed543
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp index 97b8c09f..3d12e917 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp @@ -436,8 +436,6 @@ void InspectorControlModel::updateControlledToggleState(InspectorControlBase* in // Restore original tool tip from metadata when turning control off if (!currPropValStr.size()) { inItem->m_controlled = false; - inItem->m_tooltip = Q3DStudio::CString( - inItem->m_metaProperty.m_Description.c_str()).toQString(); inItem->m_controller = ""; } else { Q3DStudio::CString propName @@ -449,8 +447,6 @@ void InspectorControlModel::updateControlledToggleState(InspectorControlBase* in if ((propNamePos == currPropValStr.ENDOFSTRING) && (propNamePos != 0)) { inItem->m_controlled = false; - inItem->m_tooltip = Q3DStudio::CString( - inItem->m_metaProperty.m_Description.c_str()).toQString(); inItem->m_controller = ""; } else { inItem->m_controlled = true; @@ -467,7 +463,6 @@ void InspectorControlModel::updateControlledToggleState(InspectorControlBase* in const QString ctrlName = currPropValStr.substr( posCtrlr, propNamePos - posCtrlr).toQString(); - inItem->m_tooltip = tr("Controlling Data Input:\n%1").arg(ctrlName); inItem->m_controller = ctrlName; } } |