Commit 281494a3 authored by Jens Bache-Wiig's avatar Jens Bache-Wiig
Browse files

Make it possible to clear keyboard shortcuts again

This was an unintentional regression. The widget in
question should not use the filter edit since it is not
a filterwidget. Also I removed the "Filter" text which
is incorrect in this case.

Task-number: QTCREATORBUG-1308
parent 73d169a4
...@@ -71,6 +71,7 @@ QWidget *CommandMappings::createPage(QWidget *parent) ...@@ -71,6 +71,7 @@ QWidget *CommandMappings::createPage(QWidget *parent)
m_page->setupUi(w); m_page->setupUi(w);
m_page->resetButton->setIcon(QPixmap(Constants::ICON_RESET)); m_page->resetButton->setIcon(QPixmap(Constants::ICON_RESET));
m_page->targetEdit->setSide(Utils::FancyLineEdit::Right); m_page->targetEdit->setSide(Utils::FancyLineEdit::Right);
m_page->targetEdit->setAutoHideIcon(true);
m_page->targetEdit->installEventFilter(this); m_page->targetEdit->installEventFilter(this);
connect(m_page->targetEdit, SIGNAL(buttonClicked()), connect(m_page->targetEdit, SIGNAL(buttonClicked()),
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="Utils::FilterLineEdit" name="targetEdit"/> <widget class="Utils::FancyLineEdit" name="targetEdit"/>
</item> </item>
<item> <item>
<widget class="QToolButton" name="resetButton"> <widget class="QToolButton" name="resetButton">
...@@ -161,6 +161,11 @@ ...@@ -161,6 +161,11 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>Utils::FancyLineEdit</class>
<extends>QLineEdit</extends>
<header location="global">utils/fancylineedit.h</header>
</customwidget>
<customwidget> <customwidget>
<class>Utils::FilterLineEdit</class> <class>Utils::FilterLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment