Index: head/devel/qt5-designer/Makefile
===================================================================
--- head/devel/qt5-designer/Makefile	(revision 457545)
+++ head/devel/qt5-designer/Makefile	(revision 457546)
@@ -1,35 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	designer
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 5 graphical user interface designer
 
 USE_QT5=	assistant_run core gui network printsupport quick uiplugin \
-		webkit widgets xml buildtools_build
+		widgets xml buildtools_build
 QT_DIST=	tools
 USES=		qmake
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 DESKTOP_ENTRIES="Qt 5 Designer" "" \
 		"${PREFIX}/share/pixmaps/designer-qt5.png" \
 		"${PREFIX}/${QT_BINDIR_REL}/designer" \
 		"Development;Qt;" true
 
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${WRKSRC}/src/${PORTNAME}
+
+OPTIONS_DEFINE=	WEBKIT
+OPTIONS_SUB=	yes
+WEBKIT_DESC=	Build WebKit-based WebView widget
+WEBKIT_QMAKE_ON=	CONFIG+=use_webkit
+WEBKIT_USE=	QT5=webkit
 
 post-patch:
 # uiplugin is built in x11-toolkits/qt5-uiplugin.
 # uitools is built in devel/qt5-uitools.
 	${REINPLACE_CMD} -e '/uiplugin/ d' -e '/uitools/ d' \
 		${WRKSRC}/src/${PORTNAME}/src/src.pro
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}/src/designer/images/designer.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/designer-qt5.png
 
 .include <bsd.port.mk>
Index: head/devel/qt5-designer/files/patch-src_designer_src_plugins_plugins.pro
===================================================================
--- head/devel/qt5-designer/files/patch-src_designer_src_plugins_plugins.pro	(nonexistent)
+++ head/devel/qt5-designer/files/patch-src_designer_src_plugins_plugins.pro	(revision 457546)
@@ -0,0 +1,16 @@
+Make QtWebKit an optional dependency of devel/qt5-designer. 
+Otherwise ports like devel/qtcreator will depend on both 
+qt5-webengine (directly) and qt5-webkit (via designer).
+
+--- src/designer/src/plugins/plugins.pro.orig	2016-11-03 08:31:16 UTC
++++ src/designer/src/plugins/plugins.pro
+@@ -1,6 +1,8 @@
+ TEMPLATE = subdirs
+ 
+ # qtHaveModule(opengl): SUBDIRS += tools/view3d
+-qtHaveModule(webkitwidgets): SUBDIRS += qwebview
++use_webkit {
++    qtHaveModule(webkitwidgets): SUBDIRS += qwebview
++}
+ win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
+ qtHaveModule(quickwidgets): SUBDIRS += qquickwidget

Property changes on: head/devel/qt5-designer/files/patch-src_designer_src_plugins_plugins.pro
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/qt5-designer/pkg-plist
===================================================================
--- head/devel/qt5-designer/pkg-plist	(revision 457545)
+++ head/devel/qt5-designer/pkg-plist	(revision 457546)
@@ -1,202 +1,202 @@
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/abstractdialoggui_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/abstractintrospection_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/actioneditor_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/actionprovider_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/actionrepository_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/codedialog_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/connectionedit_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/csshighlighter_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/deviceprofile_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/dialoggui_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/extensionfactory_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/formbuilderextra_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/formlayoutmenu_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/formwindowbase_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/grid_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/gridpanel_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/htmlhighlighter_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/iconloader_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/iconselector_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/invisible_widget_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/layout_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/layoutinfo_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/lib_pch.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/metadatabase_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/morphmenu_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/newactiondialog_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/newformwidget_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/orderdialog_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/plaintexteditor_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/plugindialog_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/pluginmanager_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/previewconfigurationwidget_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/previewmanager_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/promotionmodel_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/promotiontaskmenu_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/properties_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/propertylineedit_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_command2_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_command_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_dnditem_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_dockwidget_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_formbuilder_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_formeditorcommand_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_formwindowcommand_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_formwindowmanager_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_introspection_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_membersheet_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_menu_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_menubar_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_objectinspector_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_promotion_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_promotiondialog_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_propertycommand_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_propertyeditor_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_propertysheet_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_qsettings_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_stackedbox_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_tabwidget_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_taskmenu_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_toolbar_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_toolbox_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_utils_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_widget_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_widgetbox_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qdesigner_widgetitem_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qlayout_widget_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qsimpleresource_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qtresourceeditordialog_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qtresourcemodel_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/qtresourceview_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/rcc_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/resourcebuilder_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/richtexteditor_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/shared_enums_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/shared_global_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/shared_settings_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/sheet_delegate_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/signalslotdialog_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/spacer_widget_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/stylesheeteditor_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/textbuilder_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/textpropertyeditor_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/ui4_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/widgetdatabase_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/widgetfactory_p.h
 %%QT_INCDIR%%/QtDesigner/%%FULLVER%%/QtDesigner/private/zoomwidget_p.h
 %%QT_INCDIR%%/QtDesigner/QAbstractExtensionFactory
 %%QT_INCDIR%%/QtDesigner/QAbstractExtensionManager
 %%QT_INCDIR%%/QtDesigner/QAbstractFormBuilder
 %%QT_INCDIR%%/QtDesigner/QDesignerActionEditorInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerComponents
 %%QT_INCDIR%%/QtDesigner/QDesignerContainerExtension
 %%QT_INCDIR%%/QtDesigner/QDesignerCustomWidgetCollectionInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerCustomWidgetInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerDnDItemInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerDynamicPropertySheetExtension
 %%QT_INCDIR%%/QtDesigner/QDesignerExportWidget
 %%QT_INCDIR%%/QtDesigner/QDesignerExtraInfoExtension
 %%QT_INCDIR%%/QtDesigner/QDesignerFormEditorInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerFormEditorPluginInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerFormWindowCursorInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerFormWindowInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerFormWindowManagerInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerFormWindowToolInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerIntegration
 %%QT_INCDIR%%/QtDesigner/QDesignerIntegrationInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerLanguageExtension
 %%QT_INCDIR%%/QtDesigner/QDesignerLayoutDecorationExtension
 %%QT_INCDIR%%/QtDesigner/QDesignerMemberSheetExtension
 %%QT_INCDIR%%/QtDesigner/QDesignerMetaDataBaseInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerMetaDataBaseItemInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerNewFormWidgetInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerObjectInspectorInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerOptionsPageInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerPromotionInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerPropertyEditorInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerPropertySheetExtension
 %%QT_INCDIR%%/QtDesigner/QDesignerResourceBrowserInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerSettingsInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerTaskMenuExtension
 %%QT_INCDIR%%/QtDesigner/QDesignerWidgetBoxInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerWidgetDataBaseInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerWidgetDataBaseItemInterface
 %%QT_INCDIR%%/QtDesigner/QDesignerWidgetFactoryInterface
 %%QT_INCDIR%%/QtDesigner/QExtensionFactory
 %%QT_INCDIR%%/QtDesigner/QExtensionManager
 %%QT_INCDIR%%/QtDesigner/QFormBuilder
 %%QT_INCDIR%%/QtDesigner/QtDesigner
 %%QT_INCDIR%%/QtDesigner/QtDesignerDepends
 %%QT_INCDIR%%/QtDesigner/QtDesignerVersion
 %%QT_INCDIR%%/QtDesigner/abstractactioneditor.h
 %%QT_INCDIR%%/QtDesigner/abstractdnditem.h
 %%QT_INCDIR%%/QtDesigner/abstractformbuilder.h
 %%QT_INCDIR%%/QtDesigner/abstractformeditor.h
 %%QT_INCDIR%%/QtDesigner/abstractformeditorplugin.h
 %%QT_INCDIR%%/QtDesigner/abstractformwindow.h
 %%QT_INCDIR%%/QtDesigner/abstractformwindowcursor.h
 %%QT_INCDIR%%/QtDesigner/abstractformwindowmanager.h
 %%QT_INCDIR%%/QtDesigner/abstractformwindowtool.h
 %%QT_INCDIR%%/QtDesigner/abstractintegration.h
 %%QT_INCDIR%%/QtDesigner/abstractlanguage.h
 %%QT_INCDIR%%/QtDesigner/abstractmetadatabase.h
 %%QT_INCDIR%%/QtDesigner/abstractnewformwidget.h
 %%QT_INCDIR%%/QtDesigner/abstractobjectinspector.h
 %%QT_INCDIR%%/QtDesigner/abstractoptionspage.h
 %%QT_INCDIR%%/QtDesigner/abstractpromotioninterface.h
 %%QT_INCDIR%%/QtDesigner/abstractpropertyeditor.h
 %%QT_INCDIR%%/QtDesigner/abstractresourcebrowser.h
 %%QT_INCDIR%%/QtDesigner/abstractsettings.h
 %%QT_INCDIR%%/QtDesigner/abstractwidgetbox.h
 %%QT_INCDIR%%/QtDesigner/abstractwidgetdatabase.h
 %%QT_INCDIR%%/QtDesigner/abstractwidgetfactory.h
 %%QT_INCDIR%%/QtDesigner/container.h
 %%QT_INCDIR%%/QtDesigner/customwidget.h
 %%QT_INCDIR%%/QtDesigner/default_extensionfactory.h
 %%QT_INCDIR%%/QtDesigner/dynamicpropertysheet.h
 %%QT_INCDIR%%/QtDesigner/extension.h
 %%QT_INCDIR%%/QtDesigner/extension_global.h
 %%QT_INCDIR%%/QtDesigner/extrainfo.h
 %%QT_INCDIR%%/QtDesigner/formbuilder.h
 %%QT_INCDIR%%/QtDesigner/layoutdecoration.h
 %%QT_INCDIR%%/QtDesigner/membersheet.h
 %%QT_INCDIR%%/QtDesigner/propertysheet.h
 %%QT_INCDIR%%/QtDesigner/qdesigner_components.h
 %%QT_INCDIR%%/QtDesigner/qdesigner_components_global.h
 %%QT_INCDIR%%/QtDesigner/qdesignerexportwidget.h
 %%QT_INCDIR%%/QtDesigner/qextensionmanager.h
 %%QT_INCDIR%%/QtDesigner/qtdesignerversion.h
 %%QT_INCDIR%%/QtDesigner/sdk_global.h
 %%QT_INCDIR%%/QtDesigner/taskmenu.h
 %%QT_INCDIR%%/QtDesigner/uilib_global.h
 %%QT_INCDIR%%/QtDesignerComponents/%%FULLVER%%/QtDesignerComponents/private/lib_pch.h
 %%QT_INCDIR%%/QtDesignerComponents/QtDesignerComponents
 %%QT_INCDIR%%/QtDesignerComponents/QtDesignerComponentsDepends
 %%QT_INCDIR%%/QtDesignerComponents/QtDesignerComponentsVersion
 %%QT_INCDIR%%/QtDesignerComponents/qtdesignercomponentsversion.h
 %%QT_CMAKEDIR%%/Qt5Designer/Qt5DesignerConfig.cmake
 %%QT_CMAKEDIR%%/Qt5Designer/Qt5DesignerConfigVersion.cmake
 %%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
-%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
+%%WEBKIT%%%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
 %%QT_BINDIR%%/designer
 %%QT_LIBDIR%%/libQt5Designer.prl
 %%QT_LIBDIR%%/libQt5Designer.so
 %%QT_LIBDIR%%/libQt5Designer.so.5
 %%QT_LIBDIR%%/libQt5Designer.so.%%SHORTVER%%
 %%QT_LIBDIR%%/libQt5Designer.so.%%FULLVER%%
 %%DEBUG%%%%QT_LIBDIR%%/libQt5Designer.so.%%FULLVER%%.debug
 %%QT_LIBDIR%%/libQt5DesignerComponents.prl
 %%QT_LIBDIR%%/libQt5DesignerComponents.so
 %%QT_LIBDIR%%/libQt5DesignerComponents.so.5
 %%QT_LIBDIR%%/libQt5DesignerComponents.so.%%SHORTVER%%
 %%QT_LIBDIR%%/libQt5DesignerComponents.so.%%FULLVER%%
 %%DEBUG%%%%QT_LIBDIR%%/libQt5DesignerComponents.so.%%FULLVER%%.debug
 %%QT_MKSPECDIR%%/modules/qt_lib_designer.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_designer_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_designercomponents_private.pri
 %%QT_PLUGINDIR%%/designer/libqquickwidget.so
 %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqquickwidget.so.debug
-%%QT_PLUGINDIR%%/designer/libqwebview.so
-%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug
+%%WEBKIT%%%%QT_PLUGINDIR%%/designer/libqwebview.so
+%%WEBKIT%%%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug
 libdata/pkgconfig/Qt5Designer.pc
 share/pixmaps/designer-qt5.png