mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-01-21 17:13:22 -08:00
Merge remote branch 'upstream/master' into servatrice_trustedsources
This commit is contained in:
@@ -51,7 +51,7 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
|
||||
aClearSearch->setIcon(QIcon(":/resources/icon_clearsearch.svg"));
|
||||
connect(aClearSearch, SIGNAL(triggered()), this, SLOT(actClearSearch()));
|
||||
searchEdit = new SearchLineEdit;
|
||||
#if QT_VERSION >= 0x050000
|
||||
#if QT_VERSION >= 0x050300
|
||||
searchEdit->addAction(QIcon(":/resources/icon_search_black.svg"), QLineEdit::LeadingPosition);
|
||||
#endif
|
||||
searchEdit->setObjectName("searchEdit");
|
||||
|
||||
Reference in New Issue
Block a user