jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-22 06:43:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote branch 'upstream/master' into servatrice_trustedsources

Browse source
This commit is contained in:
woogerboy21 2014-11-19 23:06:06 -05:00
commit 565fb9ef6e
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/tab_deck_editor.cpp
View file

@ -51,7 +51,7 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
aClearSearch->setIcon(QIcon(":/resources/icon_clearsearch.svg")); aClearSearch->setIcon(QIcon(":/resources/icon_clearsearch.svg"));
connect(aClearSearch, SIGNAL(triggered()), this, SLOT(actClearSearch())); connect(aClearSearch, SIGNAL(triggered()), this, SLOT(actClearSearch()));
searchEdit = new SearchLineEdit; searchEdit = new SearchLineEdit;
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050300
searchEdit->addAction(QIcon(":/resources/icon_search_black.svg"), QLineEdit::LeadingPosition); searchEdit->addAction(QIcon(":/resources/icon_search_black.svg"), QLineEdit::LeadingPosition);
#endif #endif
searchEdit->setObjectName("searchEdit"); searchEdit->setObjectName("searchEdit");