commit ca2b5f22bedec6dbfa85863e8611ac6c40f1174c Author: David Rosca Date: Sun Dec 3 10:13:10 2017 +0100 SearchToolbar: Don't set shortcuts from UI file Fixes build with Qt 5.10 Closes #2515 --- src/lib/webtab/searchtoolbar.cpp.orig 2015-11-11 15:13:24 UTC +++ src/lib/webtab/searchtoolbar.cpp @@ -35,7 +35,9 @@ SearchToolBar::SearchToolBar(WebView* view, QWidget* p ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton)); ui->next->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowDown)); + ui->next->setShortcut(QKeySequence("Ctrl+G")); ui->previous->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowUp)); + ui->previous->setShortcut(QKeySequence("Ctrl+Shift+G")); connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(hide())); connect(ui->lineEdit, SIGNAL(textChanged(QString)), this, SLOT(findNext())); --- src/lib/webtab/searchtoolbar.ui.orig 2015-11-11 15:13:24 UTC +++ src/lib/webtab/searchtoolbar.ui @@ -64,9 +64,6 @@ 0 - - Ctrl+Shift+G - true @@ -79,9 +76,6 @@ 0 0 - - - Ctrl+G true