mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Add an upstream patch to fix the build with Qt 5.10.
In file included from webtab/searchtoolbar.cpp:21: ../../build/ui_searchtoolbar.h:76:31: error: no viable conversion from 'QLatin1String' to 'const QKeySequence' previous->setShortcut(QLatin1String("Ctrl+Shift+G")); PR: 228213
This commit is contained in:
parent
6bf3c7b33b
commit
207de9e328
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=470012
2 changed files with 45 additions and 1 deletions
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= qupzilla
|
||||
PORTVERSION= 1.8.9
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
|
||||
PKGNAMESUFFIX= -qt5
|
||||
|
|
44
www/qupzilla-qt5/files/patch-git_ca2b5f22b
Normal file
44
www/qupzilla-qt5/files/patch-git_ca2b5f22b
Normal file
|
@ -0,0 +1,44 @@
|
|||
commit ca2b5f22bedec6dbfa85863e8611ac6c40f1174c
|
||||
Author: David Rosca <nowrep@gmail.com>
|
||||
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 @@
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
- <property name="shortcut">
|
||||
- <string notr="true">Ctrl+Shift+G</string>
|
||||
- </property>
|
||||
<property name="autoRaise">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
@@ -79,9 +76,6 @@
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
- </property>
|
||||
- <property name="shortcut">
|
||||
- <string notr="true">Ctrl+G</string>
|
||||
</property>
|
||||
<property name="autoRaise">
|
||||
<bool>true</bool>
|
Loading…
Add table
Reference in a new issue