summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2010-07-01 11:25:38 +0200
committercon <qtc-committer@nokia.com>2010-07-01 11:25:38 +0200
commit9ab9f9d35ffa0362643e615dd01c54d4e9ff5ca7 (patch)
treeef7d990467689ef27a585d8e97a2d906eb30cc72
parentd3f53cca01ad1f6f9a2e59d7f643e95835f4a638 (diff)
downloadqt-creator-9ab9f9d35ffa0362643e615dd01c54d4e9ff5ca7.tar.gz
Don't clear the filter widget's focus when clearing it.
Often the reason for clicking the clear button is to type something into it afterwards. See also QTCREATORBUG-705
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp6
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h1
2 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp
index 48164c5f9e..7eca9aafd4 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp
@@ -185,7 +185,6 @@ ItemLibrary::ItemLibrary(QWidget *parent) :
lineEditLayout->addWidget(m_d->m_lineEdit, 1, 1, 1, 1);
lineEditLayout->addItem(new QSpacerItem(5, 5, QSizePolicy::Fixed, QSizePolicy::Fixed), 1, 2);
connect(m_d->m_lineEdit, SIGNAL(filterChanged(QString)), this, SLOT(setSearchFilter(QString)));
- connect(m_d->m_lineEdit, SIGNAL(buttonClicked()), this, SLOT(clearLineEditFocus()));
m_d->m_stackedWidget = new QStackedWidget(this);
m_d->m_stackedWidget->addWidget(m_d->m_itemsView);
@@ -286,11 +285,6 @@ void ItemLibrary::updateSearch()
setSearchFilter(m_d->m_lineEdit->text());
}
-void ItemLibrary::clearLineEditFocus()
-{
- m_d->m_lineEdit->clearFocus();
-}
-
void ItemLibrary::setResourcePath(const QString &resourcePath)
{
if (m_d->m_resourcesView->model() == m_d->m_resourcesDirModel)
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h
index 0eff37dee9..749ac74f17 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h
@@ -54,7 +54,6 @@ public Q_SLOTS:
void setSearchFilter(const QString &searchFilter);
void updateModel();
void updateSearch();
- void clearLineEditFocus();
void setResourcePath(const QString &resourcePath);