From df24238e08007b20ef668ad47816bdeb9be1014e Mon Sep 17 00:00:00 2001 From: barracuda156 Date: Fri, 4 Aug 2023 16:26:11 +0800 Subject: [PATCH] Alt-fix for searchlineedit in Qt4 --- modules/gui/qt4/util/searchlineedit.cpp | 3 --- modules/gui/qt4/util/searchlineedit.hpp | 25 ------------------------- 2 files changed, 28 deletions(-) diff --git modules/gui/qt4/util/searchlineedit.cpp modules/gui/qt4/util/searchlineedit.cpp index a0a6f4f493..803dbda303 100644 --- modules/gui/qt4/util/searchlineedit.cpp +++ modules/gui/qt4/util/searchlineedit.cpp @@ -103,7 +103,6 @@ void ClickLineEdit::focusOutEvent( QFocusEvent *ev ) } #endif -#ifndef Q_OS_MAC SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent ) { clearButton = new QFramelessButton( this ); @@ -201,5 +200,3 @@ void SearchLineEdit::searchEditingFinished() { emit searchDelayedChanged( text() ); } - -#endif diff --git modules/gui/qt4/util/searchlineedit.hpp modules/gui/qt4/util/searchlineedit.hpp index fe81b30547..07313e3c53 100644 --- modules/gui/qt4/util/searchlineedit.hpp +++ modules/gui/qt4/util/searchlineedit.hpp @@ -72,7 +72,6 @@ private: }; #endif -#ifndef Q_OS_MAC class QFramelessButton; class SearchLineEdit : public QLineEdit { @@ -99,29 +98,5 @@ private slots: signals: void searchDelayedChanged( const QString& ); }; -#else - -/* On Mac, we try to use the native NSSearchField */ -#include - -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& ); -}; -#endif #endif -