qupzilla1: fix build with qt-5.10

This commit is contained in:
Michael Gehring 2018-03-02 13:11:04 +00:00
parent 715d3f80ee
commit cdc1e67210
1 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,36 @@
https://github.com/sweord/qupzilla/commit/5bdd369c9514d481cf3d0761a383e087cead97c9
--- src/lib/webtab/searchtoolbar.ui
+++ src/lib/webtab/searchtoolbar.ui
@@ -64,9 +64,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="shortcut">
- <string notr="true">Ctrl+Shift+G</string>
- </property>
<property name="autoRaise">
<bool>true</bool>
</property>
@@ -80,9 +77,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="shortcut">
- <string notr="true">Ctrl+G</string>
- </property>
<property name="autoRaise">
<bool>true</bool>
</property>
--- src/lib/webtab/searchtoolbar.cpp.orig
+++ src/lib/webtab/searchtoolbar.cpp
@@ -35,7 +35,9 @@
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()));