svn commit: r513244 - head/deskutils/syncthingtray/files

[Tobias C. Berner]

Author: tcberner
Date: Sun Sep 29 14:10:13 2019
New Revision: 513244
URL: https://svnweb.freebsd.org/changeset/ports/513244

Log:
  deskutils/syncthingtray: fix build with Qt5 5.13
  
  - 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

Added:
  head/deskutils/syncthingtray/files/
  head/deskutils/syncthingtray/files/patch-webengine-version-workaround   (contents, props changed)

Added: head/deskutils/syncthingtray/files/patch-webengine-version-workaround
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/syncthingtray/files/patch-webengine-version-workaround	Sun Sep 29 14:10:13 2019	(r513244)
@@ -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));