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

Conflicts:
	src/searchlineedit.cpp

diff --cc src/searchlineedit.cpp
index 3066415ca0c7edd55690ed78225e7c5515e78e18,609d97dcc6847fe528cb5066f1fd87b913bfb015..42c2aeee3726e07708d31500b805ec02a631790a
--- 1/src/searchlineedit.cpp
--- 2/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");