Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

SearchToolbar: Don't set shortcuts from UI file

Browse Source 
Fixes build with Qt 5.10

Closes #2515
This commit is contained in:
David Rosca 2017-12-03 10:13:10 +01:00
parent f19eb53d3c
commit ca2b5f22be
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/webtab/searchtoolbar.cpp
View File

@ -36,7 +36,9 @@ SearchToolBar::SearchToolBar(WebView* view, QWidget* parent)
ui->closeButton->setIcon(IconProvider::instance()->standardIcon(QStyle::SP_DialogCloseButton)); ui->closeButton->setIcon(IconProvider::instance()->standardIcon(QStyle::SP_DialogCloseButton));
ui->next->setIcon(IconProvider::instance()->standardIcon(QStyle::SP_ArrowDown)); ui->next->setIcon(IconProvider::instance()->standardIcon(QStyle::SP_ArrowDown));
ui->next->setShortcut(QKeySequence("Ctrl+G"));
ui->previous->setIcon(IconProvider::instance()->standardIcon(QStyle::SP_ArrowUp)); ui->previous->setIcon(IconProvider::instance()->standardIcon(QStyle::SP_ArrowUp));
ui->previous->setShortcut(QKeySequence("Ctrl+Shift+G"));
connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(close())); connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(close()));
connect(ui->lineEdit, SIGNAL(textChanged(QString)), this, SLOT(findNext())); connect(ui->lineEdit, SIGNAL(textChanged(QString)), this, SLOT(findNext()));

6
src/lib/webtab/searchtoolbar.ui
View File

@ -64,9 +64,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="shortcut">
<string notr="true">Ctrl+Shift+G</string>
</property>
<property name="autoRaise"> <property name="autoRaise">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -80,9 +77,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="shortcut">
<string notr="true">Ctrl+G</string>
</property>
<property name="autoRaise"> <property name="autoRaise">
<bool>true</bool> <bool>true</bool>
</property> </property>