From: Flavio Tordini <flavio.tordini@gmail.com>
Date: Sat, 18 Sep 2010 13:35:26 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:minitube/minitube
X-Git-Tag: 1.2~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=87c080af712a5363f80ee787829711c41f81eac6;p=minitube

Merge branch 'master' of gitorious.org:minitube/minitube

Conflicts:
	src/searchlineedit.cpp
---

87c080af712a5363f80ee787829711c41f81eac6
diff --cc src/searchlineedit.cpp
index 3066415,609d97d..42c2aee
--- a/src/searchlineedit.cpp
+++ b/src/searchlineedit.cpp
@@@ -173,11 -173,11 +173,6 @@@ m_searchButton(new SearchButton(this)
      connect(lineEdit(), SIGNAL(returnPressed()),
              this, SLOT(returnPressed()));
  
- #ifdef APP_MAC_NO
 -#ifdef APP_MAC
--    setAttribute(Qt::WA_MacShowFocusRect, false);
--    setStyleSheet("SearchLineEdit { border: 1px inset gray; border-radius: 15px; background: palette(base)} SearchLineEdit::focus { border: 2px solid #6fa7e0 }");
--#endif
--
      setLeftWidget(m_searchButton);
      m_inactiveText = tr("Search");