Update Qt5 to 5.4.1.

This is probably the first time our Qt 5 ports are tracking the latest
upstream release :-)

There isn't much to report in this update, thanks to the effort spent in the
5.2->5.3 update: a lot of the work is just small plist and patch updates.
Thankfully, several patches have been upstreamed and are not needed on our
side anymore.

I would like to thank Alex Richardson <arichardson.kde@gmail.com> and Tobias
Berner <tcberner@gmail.com> for their help with the plist updates and
general testing.

PR:		198585

2 files changed, 50 insertions, 14 deletions

diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile
index 74aa3349f5d2..eeee48719bbb 100644
--- a/x11-toolkits/qt5-widgets/Makefile
+++ b/x11-toolkits/qt5-widgets/Makefile
@@ -17,8 +17,7 @@ USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-MORE_WRKSRCS=	src/plugins/accessible/${PORTNAME} \
-		src/tools/uic
+MORE_WRKSRCS=	src/tools/uic
 
 QT_DEFINES=	ACCESSIBILITY WIDGETS XSYNC
 QT_CONFIG=	accessibility accessibility-atspi-bridge xlib
@@ -45,11 +44,6 @@ pre-build:
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
 
-post-build:
-	@cd ${WRKSRC}/src/plugins/accessible/${PORTNAME} && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
-
 post-install:
 .for d in ${MORE_WRKSRCS}
 	@cd ${WRKSRC}/${d} && \
diff --git a/x11-toolkits/qt5-widgets/pkg-plist b/x11-toolkits/qt5-widgets/pkg-plist
index 5a9e49998b24..17acaf8c9548 100644
--- a/x11-toolkits/qt5-widgets/pkg-plist
+++ b/x11-toolkits/qt5-widgets/pkg-plist
@@ -3,13 +3,13 @@
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractscrollarea_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractslider_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractspinbox_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaccessiblewidgetfactory_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaction_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qandroidstyle_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qapplication_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qbasickeyeventtransition_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qbasicmouseeventtransition_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qbsptree_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcalendartextnavigator_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcolordialog_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcolumnview_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcolumnviewgrip_p.h
@@ -18,7 +18,7 @@
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcommonstylepixmaps_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcompleter_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdatetimeedit_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdesktopwidget_qpa_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdesktopwidget_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdialog_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdockarealayout_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qdockwidget_p.h
@@ -75,7 +75,6 @@
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qmenu_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qmenu_wince_resource_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qmenubar_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qopenglwidget_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qpixmapfilter_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qplaintextedit_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qproxystyle_p.h
@@ -116,7 +115,7 @@
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetresizehandler_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgettextcontrol_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgettextcontrol_p_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetwindow_qpa_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwidgetwindow_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowcontainer_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowscestyle_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowscestyle_p_p.h
@@ -136,7 +135,45 @@
 %%QT_INCDIR%%/QtWidgets/QAbstractScrollArea
 %%QT_INCDIR%%/QtWidgets/QAbstractSlider
 %%QT_INCDIR%%/QtWidgets/QAbstractSpinBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractScrollArea
+%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractSlider
+%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractSpinBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleButton
+%%QT_INCDIR%%/QtWidgets/QAccessibleCalendarWidget
+%%QT_INCDIR%%/QtWidgets/QAccessibleComboBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleDial
+%%QT_INCDIR%%/QtWidgets/QAccessibleDialogButtonBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleDisplay
+%%QT_INCDIR%%/QtWidgets/QAccessibleDockWidget
+%%QT_INCDIR%%/QtWidgets/QAccessibleDoubleSpinBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleGroupBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleLineEdit
+%%QT_INCDIR%%/QtWidgets/QAccessibleMainWindow
+%%QT_INCDIR%%/QtWidgets/QAccessibleMdiArea
+%%QT_INCDIR%%/QtWidgets/QAccessibleMdiSubWindow
+%%QT_INCDIR%%/QtWidgets/QAccessibleMenu
+%%QT_INCDIR%%/QtWidgets/QAccessibleMenuBar
+%%QT_INCDIR%%/QtWidgets/QAccessibleMenuItem
+%%QT_INCDIR%%/QtWidgets/QAccessiblePlainTextEdit
+%%QT_INCDIR%%/QtWidgets/QAccessibleProgressBar
+%%QT_INCDIR%%/QtWidgets/QAccessibleScrollArea
+%%QT_INCDIR%%/QtWidgets/QAccessibleScrollBar
+%%QT_INCDIR%%/QtWidgets/QAccessibleSlider
+%%QT_INCDIR%%/QtWidgets/QAccessibleSpinBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleStackedWidget
+%%QT_INCDIR%%/QtWidgets/QAccessibleTabBar
+%%QT_INCDIR%%/QtWidgets/QAccessibleTable
+%%QT_INCDIR%%/QtWidgets/QAccessibleTableCell
+%%QT_INCDIR%%/QtWidgets/QAccessibleTableCornerButton
+%%QT_INCDIR%%/QtWidgets/QAccessibleTableHeaderCell
+%%QT_INCDIR%%/QtWidgets/QAccessibleTextBrowser
+%%QT_INCDIR%%/QtWidgets/QAccessibleTextEdit
+%%QT_INCDIR%%/QtWidgets/QAccessibleTextWidget
+%%QT_INCDIR%%/QtWidgets/QAccessibleToolBox
+%%QT_INCDIR%%/QtWidgets/QAccessibleToolButton
+%%QT_INCDIR%%/QtWidgets/QAccessibleTree
 %%QT_INCDIR%%/QtWidgets/QAccessibleWidget
+%%QT_INCDIR%%/QtWidgets/QAccessibleWindowContainer
 %%QT_INCDIR%%/QtWidgets/QAction
 %%QT_INCDIR%%/QtWidgets/QActionGroup
 %%QT_INCDIR%%/QtWidgets/QApplication
@@ -240,6 +277,7 @@
 %%QT_INCDIR%%/QtWidgets/QMenuBar
 %%QT_INCDIR%%/QtWidgets/QMessageBox
 %%QT_INCDIR%%/QtWidgets/QMouseEventTransition
+%%QT_INCDIR%%/QtWidgets/QOpenGLWidget
 %%QT_INCDIR%%/QtWidgets/QPanGesture
 %%QT_INCDIR%%/QtWidgets/QPinchGesture
 %%QT_INCDIR%%/QtWidgets/QPlainTextDocumentLayout
@@ -349,13 +387,17 @@
 %%QT_INCDIR%%/QtWidgets/QtWidgets
 %%QT_INCDIR%%/QtWidgets/QtWidgetsDepends
 %%QT_INCDIR%%/QtWidgets/QtWidgetsVersion
+%%QT_INCDIR%%/QtWidgets/complexwidgets.h
+%%QT_INCDIR%%/QtWidgets/itemviews.h
 %%QT_INCDIR%%/QtWidgets/qabstractbutton.h
 %%QT_INCDIR%%/QtWidgets/qabstractitemdelegate.h
 %%QT_INCDIR%%/QtWidgets/qabstractitemview.h
 %%QT_INCDIR%%/QtWidgets/qabstractscrollarea.h
 %%QT_INCDIR%%/QtWidgets/qabstractslider.h
 %%QT_INCDIR%%/QtWidgets/qabstractspinbox.h
+%%QT_INCDIR%%/QtWidgets/qaccessiblemenu.h
 %%QT_INCDIR%%/QtWidgets/qaccessiblewidget.h
+%%QT_INCDIR%%/QtWidgets/qaccessiblewidgets.h
 %%QT_INCDIR%%/QtWidgets/qaction.h
 %%QT_INCDIR%%/QtWidgets/qactiongroup.h
 %%QT_INCDIR%%/QtWidgets/qapplication.h
@@ -428,6 +470,7 @@
 %%QT_INCDIR%%/QtWidgets/qmenubar.h
 %%QT_INCDIR%%/QtWidgets/qmessagebox.h
 %%QT_INCDIR%%/QtWidgets/qmouseeventtransition.h
+%%QT_INCDIR%%/QtWidgets/qopenglwidget.h
 %%QT_INCDIR%%/QtWidgets/qplaintextedit.h
 %%QT_INCDIR%%/QtWidgets/qprogressbar.h
 %%QT_INCDIR%%/QtWidgets/qprogressdialog.h
@@ -478,11 +521,12 @@
 %%QT_INCDIR%%/QtWidgets/qwidgetaction.h
 %%QT_INCDIR%%/QtWidgets/qwidgetsfunctions_wince.h
 %%QT_INCDIR%%/QtWidgets/qwizard.h
+%%QT_INCDIR%%/QtWidgets/rangecontrols.h
+%%QT_INCDIR%%/QtWidgets/simplewidgets.h
 %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake
 %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake
 %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
-%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5Widgets_AccessibleFactory.cmake
 %%QT_LIBDIR%%/libQt5Widgets.prl
 %%QT_LIBDIR%%/libQt5Widgets.so
 %%QT_LIBDIR%%/libQt5Widgets.so.5
@@ -492,7 +536,5 @@
 %%QT_BINDIR%%/uic
 %%QT_MKSPECDIR%%/modules/qt_lib_widgets.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_widgets_private.pri
-%%QT_PLUGINDIR%%/accessible/libqtaccessiblewidgets.so
-%%DEBUG%%%%QT_PLUGINDIR%%/accessible/libqtaccessiblewidgets.so.debug
 libdata/pkgconfig/Qt5Widgets.pc
 share/pixmaps/qt5logo.png