mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

deskutils/syncthingtray: fix build with Qt5 5.13

Browse Source 
- syncthingtray uses the QT_VERSION to decide on QtWebengine features, instead
  of QTWEBENGINEWIDGETS_VERSION
- when WebEngine and Core are out of sync as they tend to be for us, this leads to
  compilation errors.

PR:		238782
This commit is contained in:
Tobias C. Berner 2019-09-29 14:10:13 +00:00
parent 63e506893b
commit 9a1d88ca1a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=513244
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deskutils/syncthingtray/files/patch-webengine-version-workaround Normal file
View File

@ -0,0 +1,19 @@
--- ../syncthingtray/widgets/webview/webviewdialog.cpp.orig 2019-09-29 15:48:26.701747000 +0200
+++ ../syncthingtray/widgets/webview/webviewdialog.cpp 2019-09-29 15:49:53.491199000 +0200
@@ -12,6 +12,7 @@
#include <QKeyEvent>
#if defined(SYNCTHINGWIDGETS_USE_WEBENGINE)
#include <QWebEngineProfile>
+#include <qtwebenginewidgetsversion.h>
#endif
using namespace QtUtilities;
@@ -28,7 +29,7 @@
#if defined(SYNCTHINGWIDGETS_USE_WEBENGINE)
m_profile = new QWebEngineProfile(objectName(), this);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
+#if (QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 13, 0))
m_profile->setUrlRequestInterceptor(new WebViewInterceptor(m_connectionSettings, m_profile));
#else
m_profile->setRequestInterceptor(new WebViewInterceptor(m_connectionSettings, m_profile));