From 5fd7505f7f20372ea001dd611a405eac341894ed Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Fri, 19 Aug 2011 13:54:15 -0400
Subject: [PATCH] fixes for linux

---
 src/CMakeLists.txt         | 2 +-
 src/Qocoa/qsearchfield.cpp | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aefe951f5..e4553c2b4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -180,7 +180,7 @@ IF( APPLE )
         SET( tomahawkHeaders ${tomahawkHeaders} ${SPARKLE}/Headers )
     ENDIF(HAVE_SPARKLE)
 ELSE( APPLE )
-    SET( tomahawkSources ${tomahawkSources} mac/tomahawkapp_mac.mm  mac/macshortcuthandler.cpp Qocoa/qsearchfield.mm )
+    SET( tomahawkSources ${tomahawkSources} Qocoa/qsearchfield.cpp )
 ENDIF( APPLE )
 
 IF(GLOOX_FOUND)
diff --git a/src/Qocoa/qsearchfield.cpp b/src/Qocoa/qsearchfield.cpp
index 4549a3e71..316b31ca0 100644
--- a/src/Qocoa/qsearchfield.cpp
+++ b/src/Qocoa/qsearchfield.cpp
@@ -48,10 +48,13 @@ QSearchField::QSearchField(QWidget *parent) : QWidget(parent)
 
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->addWidget(lineEdit);
-//     TomahawkUtils::unmarginLayout(layout);
+    TomahawkUtils::unmarginLayout(layout);
+    setContentsMargins(0, 0, 0, 0);
 
     lineEdit->setStyleSheet( "QLineEdit { border: 1px solid gray; border-radius: 6px; margin-right: 2px; }" );
     lineEdit->setContentsMargins(0, 0, 0, 0);
+    lineEdit->setMinimumHeight(27);
+    setFixedHeight(27);
 }
 
 void QSearchField::setText(const QString &text)
@@ -59,9 +62,9 @@ void QSearchField::setText(const QString &text)
     pimpl->lineEdit->setText(text);
 }
 
-void QSearchField::setInputHint(const QString& text)
+void QSearchField::setPlaceholderText(const QString& text)
 {
-    pimpl->lineEdit->setPlaceholderText( text );
+    pimpl->lineEdit->setInactiveText( text );
 }
 
 void QSearchField::clear()