From 45aa74ab0796156d815e43f720e09c10c23c4d38 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Fri, 8 Oct 2010 12:44:16 +0200
Subject: [PATCH] QtQuickToolBars: bugfix for TextInput and TextEdit
TextEdit and TextInput were ignored
Reviewed-by: Kai Koehne
---
src/libs/qmleditorwidgets/contextpanewidget.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp
index d98f1943eee..b043931142b 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp
@@ -315,7 +315,9 @@ bool ContextPaneWidget::setType(const QStringList &types)
m_rectangleWidget->hide();
m_easingWidget->hide();
- if (types.contains("Text")) {
+ if (types.contains("Text") ||
+ types.contains("TextEdit") ||
+ types.contains("TextInput")) {
m_currentWidget = m_textWidget;
m_textWidget->show();
m_textWidget->setStyleVisible(true);
@@ -361,7 +363,7 @@ bool ContextPaneWidget::setType(const QStringList &types)
bool ContextPaneWidget::acceptsType(const QStringList &types)
{
- return types.contains("Text") || m_easingWidget->acceptsType(types) ||
+ return types.contains("Text") || types.contains("TextEdit") || types.contains("TextInput") || m_easingWidget->acceptsType(types) ||
types.contains("Rectangle") || types.contains("Image") || types.contains("BorderImage");
}
--
GitLab