copy 1.2 branch to trunk

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 1 insertions, 14 deletions

diff --git a/src/plugins/Ui/qsui/qsuiquicksearch.cpp b/src/plugins/Ui/qsui/qsuiquicksearch.cpp
index 2b82fa3a4..19509c9c6 100644
--- a/src/plugins/Ui/qsui/qsuiquicksearch.cpp
+++ b/src/plugins/Ui/qsui/qsuiquicksearch.cpp
@@ -41,21 +41,8 @@ QSUIQuickSearch::QSUIQuickSearch(ListWidget *listWidget, QWidget *parent) :
     setLayout(layout);
     layout->addWidget(m_lineEdit);
     m_lineEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    m_lineEdit->setClearButtonEnabled(true);
     connect(m_lineEdit, SIGNAL(textEdited(QString)), m_listWidget, SLOT(setFilterString(QString)));
-    connect(m_lineEdit, SIGNAL(textChanged(QString)), SLOT(onTextChanged(QString)));
     connect(m_manager, SIGNAL(selectedPlayListChanged(PlayListModel*,PlayListModel*)), m_lineEdit, SLOT(clear()));
     connect(m_listWidget, SIGNAL(doubleClicked()), m_lineEdit, SLOT(clear()));
-
-    m_clearButton = new QToolButton(this);
-    m_clearButton->setVisible(false);
-    m_clearButton->setAutoRaise(true);
-    m_clearButton->setIcon(QIcon::fromTheme("edit-clear"));
-    layout->addWidget(m_clearButton);
-    connect(m_clearButton, SIGNAL(clicked()), m_lineEdit, SLOT(clear()));
-    connect(m_clearButton, SIGNAL(clicked()), m_listWidget, SLOT(setFilterString()));
-}
-
-void QSUIQuickSearch::onTextChanged(const QString &str)
-{
-    m_clearButton->setVisible(!str.isEmpty());
 }