diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-03-22 07:43:24 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2018-03-23 03:57:27 +0000 |
| commit | a655a94f28bb6e4e19486eba8d50db3cc5b823b8 (patch) | |
| tree | 55bd7e72f6d45ebe65dbc57d611b0024a6b6f199 /src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp | |
| parent | 90e4f80a8492a50c147aebdfe4ea295860cf7c09 (diff) | |
Fix tooltips view menu item
Task-number: QT3DS-1320
Change-Id: If50eb65bcae06eecc52fd9b4ca20fb28016c9a5a
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp index aa6facc7..a6ebd877 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp @@ -178,7 +178,7 @@ QSize InspectorControlView::sizeHint() const void InspectorControlView::initialize() { CStudioPreferences::setQmlContextProperties(rootContext()); - rootContext()->setContextProperty("_inspectorView"_L1, this); + rootContext()->setContextProperty("_parentView"_L1, this); rootContext()->setContextProperty("_inspectorModel"_L1, m_inspectorControlModel); rootContext()->setContextProperty("_resDir"_L1, resourceImageUrl()); rootContext()->setContextProperty("_tabOrderHandler"_L1, tabOrderHandler()); @@ -536,6 +536,11 @@ void InspectorControlView::showBrowser(QQuickWidget *browser, const QPoint &poin }); } +bool InspectorControlView::toolTipsEnabled() +{ + return CStudioPreferences::ShouldShowTooltips(); +} + void InspectorControlView::OnBeginDataModelNotifications() { |