Ticket #46748: patch-vlc-qt4mac.diff

modules/gui/qt4/util/searchlineedit.cpp

@@ -103 +103 @@
 }
 #endif
 
-#ifndef Q_OS_MAC
+#ifndef Q_OS_MAC_UNUSED
 SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent )
 {
     clearButton = new QFramelessButton( this );
@@ -202 +202 @@
     emit searchDelayedChanged( text() );
 }
 
+// #else
+//
+// void SearchLineEdit::updateText( const QString& text )
+// {
+// }
+//
+// void SearchLineEdit::searchEditingFinished()
+// {
+// }
+
 #endif

modules/gui/qt4/util/searchlineedit.hpp

@@ -72 +72 @@
 };
 #endif
 
-#ifndef Q_OS_MAC
+#ifndef Q_OS_MAC_UNUSED
 class QFramelessButton;
 class SearchLineEdit : public QLineEdit
 {
@@ -99 +99 @@
 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() {}
-
-    virtual QSize sizeHint() const { return QSize(150, 40); }
-
-public slots:
-    void clear() {}
-
-signals:
-    void searchDelayedChanged( const QString& );
-    void textEdited( 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() {}
+//
+//     virtual QSize sizeHint() const { return QSize(150, 40); }
+//
+// public slots:
+//     void clear() {}
+//
+// // moc does not look at #ifdefs, so we must provide the same slots and signals
+// private slots:
+//     void updateText( const QString& );
+//     void searchEditingFinished();
+//
+// signals:
+//     void searchDelayedChanged( const QString& );
+//     void textEdited( const QString& );
+// };
 #endif
 
 #endif