[vlc-commits] qt: Fix searchlineedit linking on macOS

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Sun Nov 26 04:15:56 2017 +0100| [21b92d680c3128cbe6d12e89ef979f02254df187] | committer: Marvin Scholz

qt: Fix searchlineedit linking on macOS

The macOS specific file is not used anymore, so it's necessary to enable
this code again on macOS too, else linking will fail as there is no
implementation.

Fix #7279

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21b92d680c3128cbe6d12e89ef979f02254df187
---

 modules/gui/qt/util/searchlineedit.cpp |  3 ---
 modules/gui/qt/util/searchlineedit.hpp | 24 ------------------------
 2 files changed, 27 deletions(-)

diff --git a/modules/gui/qt/util/searchlineedit.cpp b/modules/gui/qt/util/searchlineedit.cpp
index bf0b8d85f7..c4c7d8e2b6 100644
--- a/modules/gui/qt/util/searchlineedit.cpp
+++ b/modules/gui/qt/util/searchlineedit.cpp
@@ -40,7 +40,6 @@
 
 #include <vlc_intf_strings.h>
 
-#ifndef Q_OS_MAC
 SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent )
 {
     clearButton = new QFramelessButton( this );
@@ -138,5 +137,3 @@ void SearchLineEdit::searchEditingFinished()
 {
     emit searchDelayedChanged( text() );
 }
-
-#endif
diff --git a/modules/gui/qt/util/searchlineedit.hpp b/modules/gui/qt/util/searchlineedit.hpp
index ceb1a43dc0..fde9c16b0c 100644
--- a/modules/gui/qt/util/searchlineedit.hpp
+++ b/modules/gui/qt/util/searchlineedit.hpp
@@ -44,7 +44,6 @@ public:
     }
 };
 
-#ifndef Q_OS_MAC
 class QFramelessButton;
 class SearchLineEdit : public QLineEdit
 {
@@ -71,29 +70,6 @@ private slots:
 signals:
     void searchDelayedChanged( const QString& );
 };
-#else
-
-/* On Mac, we try to use the native NSSearchField */
-#include <QMacCocoaViewContainer>
-
-class SearchLineEdit : public QMacCocoaViewContainer
-{
-    Q_OBJECT
-
-public:
-    SearchLineEdit(QWidget *parent = 0);
-    virtual ~SearchLineEdit() {}
-
-    QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(150, 40); }
-
-public slots:
-    void clear() {}
-
-signals:
-    void searchDelayedChanged( const QString& );
-    void textEdited( const QString& );
-};
-#endif
 
 #endif