Update the Qt5 ports to 5.6.1.

This took longer than expected, but there are quite a few changes to the
existing ports and a few new ones.

General upstream changes:
- Starting with Qt 5.6.2, Qt will fail at configuration time if LibreSSL is
  being used. According to the discussion here:
  https://codereview.qt-project.org/#/c/154800/
  The Qt project is not opposed to LibreSSL, but does not want to mix
  support for it into the OpenSSL backend code, especially as they move
  towards supporting OpenSSL 1.1.
  People interested in LibreSSL support are welcome to submit a separate
  backend upstream, but are expected to maintain it. We (kde@) are not
  opposed to carrying some patches authored by others in the future, as long
  as they are not huge and destabilizing.
- When Qt detects the compiler supports C++11, it will pass -std=gnu++11 by
  default (this is an upstream change). You can add "CONFIG -= c++11" to
  your .pro. Qt 5.7 will require C++11.
- www/webkit-qt5: The QtWebKit module is deprecated upstream, and is shipped
  separately as a community release tarball. kde@ does not have an ETA for a
  qt5-webengine port, as it requires a huge effort (and number of patches)
  similar to maintaining www/chromium itself.
- x11-toolkits/qt5-declarative has been deprecated upstream. The last
  release is 5.5.1.

Relevant changes:
- devel/qmake5: The freebsd-clang mkspec has become the default mkspec on
  FreeBSD, replacing the outdated freebsd-g++ one that was moved to
  unsupported/ (it still works though).
- devel/qt5-qdoc: qdoc was moved to qttools upstream, but its data files are
  still in qtbase. The data files are now in the qt5-qdoc-data port.
- misc/qt5-doc: Clean up and stop requiring a compiler and fumbling with
  mkspecs. Instead of running the `configure' script, which requires a
  compiler and adjustments to the mkspecs files and also ends up building a
  new qmake binary, we now leverage USES=qmake to generate all the Makefiles
  from the top-level qt.pro. Getting this to work requires some tricks,
  though, and qt.conf.in has a longer explanation of what's being done.
  Switch to USES=gmake to be able to drop MAKE_JOBS_UNSAFE=yes.

New ports:
- comms/qt5-serialbus
- devel/qt5-qdoc-data
- x11-toolkits/qt5-quickcontrols2

Big thanks to Adriaan de Groot (groot@kde.org), tcberner@ and Loise Nolden
(nolden@kde.org) for the huge amount of work they put into this
patch. Loise in particular also sent quite a few changes upstream that were
essential for this update to work.

PR:		211916

18 files changed, 424 insertions, 94 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 50784df99b70..80ac42702b5f 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -223,6 +223,7 @@
     SUBDIR += qt5-gui
     SUBDIR += qt5-quick
     SUBDIR += qt5-quickcontrols
+    SUBDIR += qt5-quickcontrols2
     SUBDIR += qt5-uiplugin
     SUBDIR += qt5-widgets
     SUBDIR += qtermwidget
diff --git a/x11-toolkits/qt5-canvas3d/Makefile b/x11-toolkits/qt5-canvas3d/Makefile
index a2b406837d1b..a5fed6043122 100644
--- a/x11-toolkits/qt5-canvas3d/Makefile
+++ b/x11-toolkits/qt5-canvas3d/Makefile
@@ -14,10 +14,4 @@ USES=		qmake
 
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
-post-install:
-	${MKDIR} ${STAGEDIR}/usr/local/share/qtcreator/templates/wizards && \
-	cd ${WRKSRC}/creatortemplates && \
-	${COPYTREE_SHARE} qtcanvas3d ${STAGEDIR}/usr/local/share/qtcreator/templates/wizards && \
-	${COPYTREE_SHARE} qtcanvas3dthreejs ${STAGEDIR}/usr/local/share/qtcreator/templates/wizards
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-canvas3d/pkg-plist b/x11-toolkits/qt5-canvas3d/pkg-plist
index 88621c71a913..e82c07239615 100644
--- a/x11-toolkits/qt5-canvas3d/pkg-plist
+++ b/x11-toolkits/qt5-canvas3d/pkg-plist
@@ -1,25 +1,4 @@
-%%QT_QMLDIR%%/QtCanvas3D/designer/default/Canvas3D.qml
-%%QT_QMLDIR%%/QtCanvas3D/designer/images/canvas3d-icon.png
-%%QT_QMLDIR%%/QtCanvas3D/designer/images/canvas3d-icon16.png
-%%QT_QMLDIR%%/QtCanvas3D/designer/qtcanvas3d.metainfo
 %%QT_QMLDIR%%/QtCanvas3D/libqtcanvas3d.so
 %%DEBUG%%%%QT_QMLDIR%%/QtCanvas3D/libqtcanvas3d.so.debug
 %%QT_QMLDIR%%/QtCanvas3D/plugins.qmltypes
 %%QT_QMLDIR%%/QtCanvas3D/qmldir
-share/qtcreator/templates/wizards/qtcanvas3d/deployment.pri
-share/qtcreator/templates/wizards/qtcanvas3d/glcode.js
-share/qtcreator/templates/wizards/qtcanvas3d/main.cpp
-share/qtcreator/templates/wizards/qtcanvas3d/main.qml
-share/qtcreator/templates/wizards/qtcanvas3d/project.pro
-share/qtcreator/templates/wizards/qtcanvas3d/qtcanvas3d.png
-share/qtcreator/templates/wizards/qtcanvas3d/qtcanvas3d.qrc
-share/qtcreator/templates/wizards/qtcanvas3d/wizard.xml
-share/qtcreator/templates/wizards/qtcanvas3dthreejs/3rdparty/three.js
-share/qtcreator/templates/wizards/qtcanvas3dthreejs/deployment.pri
-share/qtcreator/templates/wizards/qtcanvas3dthreejs/glcode.js
-share/qtcreator/templates/wizards/qtcanvas3dthreejs/main.cpp
-share/qtcreator/templates/wizards/qtcanvas3dthreejs/main.qml
-share/qtcreator/templates/wizards/qtcanvas3dthreejs/project.pro
-share/qtcreator/templates/wizards/qtcanvas3dthreejs/qtcanvas3d.png
-share/qtcreator/templates/wizards/qtcanvas3dthreejs/qtcanvas3dthreejs.qrc
-share/qtcreator/templates/wizards/qtcanvas3dthreejs/wizard.xml
diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile
index 7a0065698ca2..e42955f5c4ad 100644
--- a/x11-toolkits/qt5-declarative/Makefile
+++ b/x11-toolkits/qt5-declarative/Makefile
@@ -1,13 +1,16 @@
 # $FreeBSD$
 
 PORTNAME=	declarative
-DISTVERSION=	${QT5_VERSION}
+DISTVERSION=	5.5.1  # QtQuick1 was last released with Qt 5.5.
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 4-compatible declarative UI framework
 
+DISTINFO_FILE=	${MASTERDIR}/distinfo
+QT5_VERSION=	${DISTVERSION}
+
 USE_QT5=	core designer gui network opengl script sql webkit \
 		widgets xmlpatterns buildtools_build
 QT_DIST=	quick1
diff --git a/x11-toolkits/qt5-declarative/distinfo b/x11-toolkits/qt5-declarative/distinfo
new file mode 100644
index 000000000000..9fc3d4b0a996
--- /dev/null
+++ b/x11-toolkits/qt5-declarative/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1474105531
+SHA256 (KDE/Qt/5.5.1/qtquick1-opensource-src-5.5.1.tar.xz) = c812a7e59a8b9f0a87693181059933e15fef04bc875b6486cd653be1b9b51f2c
+SIZE (KDE/Qt/5.5.1/qtquick1-opensource-src-5.5.1.tar.xz) = 16028732
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index be27ff85b2c1..112100ece8c3 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	gui
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 PKGNAMEPREFIX=	qt5-
 
@@ -22,7 +21,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
-USES=		jpeg
+USES=		compiler:features jpeg
 USE_GL=		gl egl
 USE_GNOME=	glib20
 USE_QT5=	core dbus network qmake_build buildtools_build
@@ -70,6 +69,19 @@ RUN_DEPENDS+=	${LOCALBASE}/share/fonts/encodings/encodings.dir:x11-fonts/encodin
 
 CFLAGS_powerpc64=	-mminimal-toc
 
+.include <bsd.port.pre.mk>
+
+# Base GCC fails to build qdrawhelper.cpp:
+# painting/qdrawhelper.cpp: In function 'void qConvertARGB64PMToA2RGB30PM_sse2(uint*, const QRgba64*, int)':
+# painting/qdrawhelper.cpp:1276: note: use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts
+# painting/qdrawhelper.cpp:1276: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
+# painting/qdrawhelper.cpp:1277: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
+# painting/qdrawhelper.cpp:1278: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
+# painting/qdrawhelper.cpp:1282: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
+.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
+CXXFLAGS+=	-flax-vector-conversions
+.endif
+
 post-build:
 .for d in ${MORE_WRKSRCS}
 	@cd ${WRKSRC}/${d} && \
@@ -84,4 +96,4 @@ post-install:
 		${MAKE_ARGS} ${INSTALL_TARGET}
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt5-gui/pkg-plist b/x11-toolkits/qt5-gui/pkg-plist
index af4311541175..4f20f2a8425b 100644
--- a/x11-toolkits/qt5-gui/pkg-plist
+++ b/x11-toolkits/qt5-gui/pkg-plist
@@ -35,6 +35,7 @@
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qguiapplication_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qharfbuzzng_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qhexstring_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qhighdpiscaling_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qicon_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qiconloader_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimage_p.h
@@ -96,6 +97,7 @@
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrasterizer_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrawfont_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrbtree_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qrgba64_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qscreen_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qsessionmanager_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qshapedpixmapdndwindow_p.h
@@ -267,6 +269,8 @@
 %%QT_INCDIR%%/QtGui/QOpenGLContextGroup
 %%QT_INCDIR%%/QtGui/QOpenGLDebugLogger
 %%QT_INCDIR%%/QtGui/QOpenGLDebugMessage
+%%QT_INCDIR%%/QtGui/QOpenGLExtraFunctions
+%%QT_INCDIR%%/QtGui/QOpenGLExtraFunctionsPrivate
 %%QT_INCDIR%%/QtGui/QOpenGLFramebufferObject
 %%QT_INCDIR%%/QtGui/QOpenGLFramebufferObjectFormat
 %%QT_INCDIR%%/QtGui/QOpenGLFunctions
@@ -341,6 +345,7 @@
 %%QT_INCDIR%%/QtGui/QRegularExpressionValidator
 %%QT_INCDIR%%/QtGui/QResizeEvent
 %%QT_INCDIR%%/QtGui/QRgb
+%%QT_INCDIR%%/QtGui/QRgba64
 %%QT_INCDIR%%/QtGui/QScreen
 %%QT_INCDIR%%/QtGui/QScreenOrientationChangeEvent
 %%QT_INCDIR%%/QtGui/QScrollEvent
@@ -448,6 +453,7 @@
 %%QT_INCDIR%%/QtGui/qopengldebug.h
 %%QT_INCDIR%%/QtGui/qopengles2ext.h
 %%QT_INCDIR%%/QtGui/qopenglext.h
+%%QT_INCDIR%%/QtGui/qopenglextrafunctions.h
 %%QT_INCDIR%%/QtGui/qopenglframebufferobject.h
 %%QT_INCDIR%%/QtGui/qopenglfunctions.h
 %%QT_INCDIR%%/QtGui/qopenglfunctions_1_0.h
@@ -507,6 +513,7 @@
 %%QT_INCDIR%%/QtGui/qrawfont.h
 %%QT_INCDIR%%/QtGui/qregion.h
 %%QT_INCDIR%%/QtGui/qrgb.h
+%%QT_INCDIR%%/QtGui/qrgba64.h
 %%QT_INCDIR%%/QtGui/qscreen.h
 %%QT_INCDIR%%/QtGui/qsessionmanager.h
 %%QT_INCDIR%%/QtGui/qstandarditemmodel.h
@@ -542,22 +549,30 @@
 %%QT_INCDIR%%/QtOpenGLExtensions/qopenglextensions.h
 %%QT_INCDIR%%/QtOpenGLExtensions/qtopenglextensionsversion.h
 %%QT_INCDIR%%/QtPlatformHeaders/QCocoaNativeContext
+%%QT_INCDIR%%/QtPlatformHeaders/QCocoaWindowFunctions
 %%QT_INCDIR%%/QtPlatformHeaders/QEGLNativeContext
 %%QT_INCDIR%%/QtPlatformHeaders/QEglFSFunctions
 %%QT_INCDIR%%/QtPlatformHeaders/QGLXNativeContext
+%%QT_INCDIR%%/QtPlatformHeaders/QPlatformHeaderHelper
 %%QT_INCDIR%%/QtPlatformHeaders/QWGLNativeContext
 %%QT_INCDIR%%/QtPlatformHeaders/QWindowsWindowFunctions
+%%QT_INCDIR%%/QtPlatformHeaders/QXcbIntegrationFunctions
+%%QT_INCDIR%%/QtPlatformHeaders/QXcbScreenFunctions
 %%QT_INCDIR%%/QtPlatformHeaders/QXcbWindowFunctions
 %%QT_INCDIR%%/QtPlatformHeaders/QtPlatformHeaders
 %%QT_INCDIR%%/QtPlatformHeaders/QtPlatformHeadersDepends
 %%QT_INCDIR%%/QtPlatformHeaders/QtPlatformHeadersVersion
 %%QT_INCDIR%%/QtPlatformHeaders/qcocoanativecontext.h
+%%QT_INCDIR%%/QtPlatformHeaders/qcocoawindowfunctions.h
 %%QT_INCDIR%%/QtPlatformHeaders/qeglfsfunctions.h
 %%QT_INCDIR%%/QtPlatformHeaders/qeglnativecontext.h
 %%QT_INCDIR%%/QtPlatformHeaders/qglxnativecontext.h
+%%QT_INCDIR%%/QtPlatformHeaders/qplatformheaderhelper.h
 %%QT_INCDIR%%/QtPlatformHeaders/qtplatformheadersversion.h
 %%QT_INCDIR%%/QtPlatformHeaders/qwglnativecontext.h
 %%QT_INCDIR%%/QtPlatformHeaders/qwindowswindowfunctions.h
+%%QT_INCDIR%%/QtPlatformHeaders/qxcbintegrationfunctions.h
+%%QT_INCDIR%%/QtPlatformHeaders/qxcbscreenfunctions.h
 %%QT_INCDIR%%/QtPlatformHeaders/qxcbwindowfunctions.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/application_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/atspiadaptor_p.h
@@ -568,7 +583,6 @@
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/dbusconnection_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qaccessiblebridgeutils_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qbasicfontdatabase_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcfsocketnotifier_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcoretextfontdatabase_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenuadaptor_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenuconnection_p.h
@@ -583,10 +597,7 @@
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglconvenience_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglpbuffer_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformcontext_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformcursor_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformintegration_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformscreen_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformwindow_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglstreamconvenience_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevkeyboard_defaultmap_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevkeyboardhandler_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevkeyboardmanager_p.h
@@ -595,7 +606,6 @@
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtablet_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtouchhandler_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtouchmanager_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeventdispatcher_cf_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeventdispatcher_glib_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfbbackingstore_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfbcursor_p.h
@@ -620,6 +630,7 @@
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qstatusnotifieritemadaptor_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qtslib_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qwindowsguieventdispatcher_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qxdgnotificationproxy_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qxlibeglintegration_p.h
 %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/struct_marshallers_p.h
@@ -689,5 +700,3 @@
 %%DEBUG%%%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-glx-integration.so.debug
 libdata/pkgconfig/Qt5Gui.pc
 libdata/pkgconfig/Qt5OpenGLExtensions.pc
-libdata/pkgconfig/Qt5PlatformSupport.pc
-libdata/pkgconfig/Qt5XcbQpa.pc
diff --git a/x11-toolkits/qt5-quick/Makefile b/x11-toolkits/qt5-quick/Makefile
index 8cf1e89e2ad7..ec0f97a8a930 100644
--- a/x11-toolkits/qt5-quick/Makefile
+++ b/x11-toolkits/qt5-quick/Makefile
@@ -12,7 +12,7 @@ USE_GL=		gl
 USE_QT5=	core gui network qml sql testlib \
 		widgets xmlpatterns buildtools_build
 QT_DIST=	declarative
-USES=		qmake
+USES=		python:build qmake
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 QT_DEFINES=	ACCESSIBILITY
@@ -37,4 +37,9 @@ post-configure:
 	${PRINTF} ".DEFAULT:\n\t@${DO_NADA}" \
 		> ${CONFIGURE_WRKSRC}/src/qmldevtools/Makefile
 
+post-patch:
+# qtdeclarative.pro wants to run python, replace that with PYTHON_CMD
+	${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \
+		${WRKSRC}/qtdeclarative.pro
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-quick/pkg-plist b/x11-toolkits/qt5-quick/pkg-plist
index c95c026228b6..f990abab6288 100644
--- a/x11-toolkits/qt5-quick/pkg-plist
+++ b/x11-toolkits/qt5-quick/pkg-plist
@@ -1,6 +1,6 @@
-%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/designerwindowmanager_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickitem_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickview_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qqmldesignermetaobject_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessibleattached_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessiblefactory_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickanchors_p.h
@@ -26,6 +26,14 @@
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickcontext2dcommandbuffer_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickcontext2dtexture_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickcontext2dtile_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickdesignercustomobjectdata_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickdesignersupport_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickdesignersupportitems_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickdesignersupportmetainfo_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickdesignersupportproperties_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickdesignersupportpropertychanges_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickdesignersupportstates_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickdesignerwindowmanager_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickdrag_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickdroparea_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickevents_p_p.h
@@ -101,6 +109,7 @@
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktext_p_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextcontrol_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextcontrol_p_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextdocument_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextedit_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextedit_p_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextinput_p.h
@@ -114,6 +123,7 @@
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktransitionmanager_p_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktranslate_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickutilmodule_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvalidator_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickvaluetypes_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickview_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindow_p.h
@@ -146,15 +156,16 @@
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrenderloop_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrendernode_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgshadersourcebuilder_p.h
-%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgshareddistancefieldglyphcache_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexture_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexturematerial_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgthreadedrenderloop_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgwindowsrenderloop_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qtquick2_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qtquickglobal_p.h
+%%QT_INCDIR%%/QtQuick/QQuickAsyncImageProvider
 %%QT_INCDIR%%/QtQuick/QQuickFramebufferObject
 %%QT_INCDIR%%/QtQuick/QQuickImageProvider
+%%QT_INCDIR%%/QtQuick/QQuickImageResponse
 %%QT_INCDIR%%/QtQuick/QQuickItem
 %%QT_INCDIR%%/QtQuick/QQuickItemGrabResult
 %%QT_INCDIR%%/QtQuick/QQuickPaintedItem
@@ -193,7 +204,6 @@
 %%QT_INCDIR%%/QtQuick/QtQuick
 %%QT_INCDIR%%/QtQuick/QtQuickDepends
 %%QT_INCDIR%%/QtQuick/QtQuickVersion
-%%QT_INCDIR%%/QtQuick/designersupport.h
 %%QT_INCDIR%%/QtQuick/qquickframebufferobject.h
 %%QT_INCDIR%%/QtQuick/qquickimageprovider.h
 %%QT_INCDIR%%/QtQuick/qquickitem.h
@@ -270,8 +280,13 @@
 %%QT_INCDIR%%/QtQuickWidgets/qquickwidget.h
 %%QT_INCDIR%%/QtQuickWidgets/qtquickwidgetsglobal.h
 %%QT_INCDIR%%/QtQuickWidgets/qtquickwidgetsversion.h
-%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake
-%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QtQuick2Plugin.cmake
+%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QLocalClientConnectionFactory.cmake
+%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QQmlDebugServerFactory.cmake
+%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QQmlDebuggerServiceFactory.cmake
+%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QQmlInspectorServiceFactory.cmake
+%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QQmlNativeDebugConnectorFactory.cmake
+%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QQmlProfilerServiceFactory.cmake
+%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QTcpServerConnectionFactory.cmake
 %%QT_LIBDIR%%/cmake/Qt5Quick/Qt5QuickConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5Quick/Qt5QuickConfigVersion.cmake
 %%QT_LIBDIR%%/cmake/Qt5QuickTest/Qt5QuickTestConfig.cmake
@@ -318,8 +333,18 @@
 %%QT_MKSPECDIR%%/modules/qt_lib_quickparticles_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets_private.pri
-%%QT_PLUGINDIR%%/qmltooling/libqmldbg_qtquick2.so
-%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_qtquick2.so.debug
+%%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so
+%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so.debug
+%%QT_PLUGINDIR%%/qmltooling/libqmldbg_inspector.so
+%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_inspector.so.debug
+%%QT_PLUGINDIR%%/qmltooling/libqmldbg_local.so
+%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_local.so.debug
+%%QT_PLUGINDIR%%/qmltooling/libqmldbg_native.so
+%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_native.so.debug
+%%QT_PLUGINDIR%%/qmltooling/libqmldbg_profiler.so
+%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_profiler.so.debug
+%%QT_PLUGINDIR%%/qmltooling/libqmldbg_server.so
+%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_server.so.debug
 %%QT_PLUGINDIR%%/qmltooling/libqmldbg_tcp.so
 %%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_tcp.so.debug
 %%QT_QMLDIR%%/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
@@ -338,6 +363,8 @@
 %%DEBUG%%%%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so.debug
 %%QT_QMLDIR%%/QtQml/StateMachine/plugins.qmltypes
 %%QT_QMLDIR%%/QtQml/StateMachine/qmldir
+%%QT_QMLDIR%%/QtQml/plugins.qmltypes
+%%QT_QMLDIR%%/QtQml/qmldir
 %%QT_QMLDIR%%/QtQuick.2/libqtquick2plugin.so
 %%DEBUG%%%%QT_QMLDIR%%/QtQuick.2/libqtquick2plugin.so.debug
 %%QT_QMLDIR%%/QtQuick.2/plugins.qmltypes
@@ -365,7 +392,7 @@
 %%QT_QMLDIR%%/QtTest/plugins.qmltypes
 %%QT_QMLDIR%%/QtTest/qmldir
 %%QT_QMLDIR%%/QtTest/testlogger.js
+%%QT_QMLDIR%%/builtins.qmltypes
 libdata/pkgconfig/Qt5Quick.pc
-libdata/pkgconfig/Qt5QuickParticles.pc
 libdata/pkgconfig/Qt5QuickTest.pc
 libdata/pkgconfig/Qt5QuickWidgets.pc
diff --git a/x11-toolkits/qt5-quickcontrols/pkg-plist b/x11-toolkits/qt5-quickcontrols/pkg-plist
index a02b888a64e9..404a2d9ea6e7 100644
--- a/x11-toolkits/qt5-quickcontrols/pkg-plist
+++ b/x11-toolkits/qt5-quickcontrols/pkg-plist
@@ -173,6 +173,7 @@
 %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultMessageDialog.qml
 %%QT_QMLDIR%%/QtQuick/Dialogs/Private/libdialogsprivateplugin.so
 %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/Private/libdialogsprivateplugin.so.debug
+%%QT_QMLDIR%%/QtQuick/Dialogs/Private/plugins.qmltypes
 %%QT_QMLDIR%%/QtQuick/Dialogs/Private/qmldir
 %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetColorDialog.qml
 %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/WidgetFileDialog.qml
diff --git a/x11-toolkits/qt5-quickcontrols2/Makefile b/x11-toolkits/qt5-quickcontrols2/Makefile
new file mode 100644
index 000000000000..718a0a94e8a9
--- /dev/null
+++ b/x11-toolkits/qt5-quickcontrols2/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	quickcontrols2
+DISTVERSION=	${QT5_VERSION}
+CATEGORIES=	x11-toolkits
+PKGNAMEPREFIX=	qt5-
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Set of controls for building complete interfaces in Qt Quick
+
+USE_QT5=	core gui qml quick widgets \
+		buildtools_build
+QT_DIST=	${PORTNAME}
+USES=		qmake
+USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-quickcontrols2/pkg-descr b/x11-toolkits/qt5-quickcontrols2/pkg-descr
new file mode 100644
index 000000000000..66e67043c849
--- /dev/null
+++ b/x11-toolkits/qt5-quickcontrols2/pkg-descr
@@ -0,0 +1,7 @@
+Qt is a cross-platform application and UI framework for developers
+using C++ or QML, a CSS/JavaScript-like language.
+
+The Qt Quick Controls module provides a set of controls that can be
+used to build complete interfaces in Qt Quick.
+
+WWW: http://qt-project.org
diff --git a/x11-toolkits/qt5-quickcontrols2/pkg-plist b/x11-toolkits/qt5-quickcontrols2/pkg-plist
new file mode 100644
index 000000000000..6b561ac2d234
--- /dev/null
+++ b/x11-toolkits/qt5-quickcontrols2/pkg-plist
@@ -0,0 +1,312 @@
+%%QT_INCDIR%%/QtLabsControls/%%FULLVER%%/QtLabsControls/private/qquickpaddedrectangle_p.h
+%%QT_INCDIR%%/QtLabsControls/%%FULLVER%%/QtLabsControls/private/qquickproxytheme_p.h
+%%QT_INCDIR%%/QtLabsControls/%%FULLVER%%/QtLabsControls/private/qquickstyle_p.h
+%%QT_INCDIR%%/QtLabsControls/%%FULLVER%%/QtLabsControls/private/qquickstyleselector_p.h
+%%QT_INCDIR%%/QtLabsControls/%%FULLVER%%/QtLabsControls/private/qquickstyleselector_p_p.h
+%%QT_INCDIR%%/QtLabsControls/QtLabsControls
+%%QT_INCDIR%%/QtLabsControls/QtLabsControlsDepends
+%%QT_INCDIR%%/QtLabsControls/QtLabsControlsVersion
+%%QT_INCDIR%%/QtLabsControls/qtlabscontrolsversion.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickabstractbutton_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickabstractbutton_p_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickapplicationwindow_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickbusyindicator_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickbutton_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickbuttongroup_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcheckbox_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcombobox_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcontainer_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcontainer_p_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcontrol_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcontrol_p_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickdial_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickdrawer_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickframe_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickframe_p_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickgroupbox_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickitemdelegate_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicklabel_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicklabel_p_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickmenu_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickmenu_p_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickmenuitem_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickoverlay_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpage_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpageindicator_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpane_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpane_p_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpopup_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpopup_p_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpressandholdhelper_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickprogressbar_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickradiobutton_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickrangeslider_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickscrollbar_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickscrollindicator_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickslider_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickspinbox_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickstackview_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickstackview_p_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickswipeview_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickswitch_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktabbar_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktabbutton_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktextarea_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktextarea_p_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktextfield_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktextfield_p_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktoolbar_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktoolbutton_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktumbler_p.h
+%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qtlabstemplatesglobal_p.h
+%%QT_INCDIR%%/QtLabsTemplates/QtLabsTemplates
+%%QT_INCDIR%%/QtLabsTemplates/QtLabsTemplatesDepends
+%%QT_INCDIR%%/QtLabsTemplates/QtLabsTemplatesVersion
+%%QT_INCDIR%%/QtLabsTemplates/qtlabstemplatesversion.h
+%%QT_LIBDIR%%/libQt5LabsControls.a
+%%QT_LIBDIR%%/libQt5LabsControls.prl
+%%QT_LIBDIR%%/libQt5LabsTemplates.prl
+%%QT_LIBDIR%%/libQt5LabsTemplates.so
+%%QT_LIBDIR%%/libQt5LabsTemplates.so.5
+%%QT_LIBDIR%%/libQt5LabsTemplates.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt5LabsTemplates.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQt5LabsTemplates.so.%%FULLVER%%.debug
+%%QT_MKSPECDIR%%/modules/qt_lib_labscontrols_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_labstemplates_private.pri
+%%QT_QMLDIR%%/Qt/labs/calendar/DayOfWeekRow.qml
+%%QT_QMLDIR%%/Qt/labs/calendar/MonthGrid.qml
+%%QT_QMLDIR%%/Qt/labs/calendar/WeekNumberColumn.qml
+%%QT_QMLDIR%%/Qt/labs/calendar/libqtlabscalendarplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/calendar/libqtlabscalendarplugin.so.debug
+%%QT_QMLDIR%%/Qt/labs/calendar/plugins.qmltypes
+%%QT_QMLDIR%%/Qt/labs/calendar/qmldir
+%%QT_QMLDIR%%/Qt/labs/controls/ApplicationWindow.qml
+%%QT_QMLDIR%%/Qt/labs/controls/BusyIndicator.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Button.qml
+%%QT_QMLDIR%%/Qt/labs/controls/CheckBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/ComboBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Dial.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Drawer.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Frame.qml
+%%QT_QMLDIR%%/Qt/labs/controls/GroupBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/ItemDelegate.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Label.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Menu.qml
+%%QT_QMLDIR%%/Qt/labs/controls/MenuItem.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Page.qml
+%%QT_QMLDIR%%/Qt/labs/controls/PageIndicator.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Pane.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Popup.qml
+%%QT_QMLDIR%%/Qt/labs/controls/ProgressBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/RadioButton.qml
+%%QT_QMLDIR%%/Qt/labs/controls/RangeSlider.qml
+%%QT_QMLDIR%%/Qt/labs/controls/ScrollBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/ScrollIndicator.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Slider.qml
+%%QT_QMLDIR%%/Qt/labs/controls/SpinBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/StackView.qml
+%%QT_QMLDIR%%/Qt/labs/controls/SwipeView.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Switch.qml
+%%QT_QMLDIR%%/Qt/labs/controls/TabBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/TabButton.qml
+%%QT_QMLDIR%%/Qt/labs/controls/TextArea.qml
+%%QT_QMLDIR%%/Qt/labs/controls/TextField.qml
+%%QT_QMLDIR%%/Qt/labs/controls/ToolBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/ToolButton.qml
+%%QT_QMLDIR%%/Qt/labs/controls/Tumbler.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/BusyIndicatorSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/ButtonSection.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/ButtonSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/CheckBoxSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/ComboBoxSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/ControlSection.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/ControlSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/DialSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/FrameSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/GroupBoxSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/ItemDelegateSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/LabelSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/PaddingSection.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/PageIndicatorSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/PaneSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/ProgressBarSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/RadioButtonSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/SliderSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/SpinBoxSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/SwitchSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/TextAreaSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/TextFieldSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/ToolBarSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/ToolButtonSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/TumblerSpecifics.qml
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/busyindicator-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/busyindicator-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/busyindicator-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/busyindicator-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/button-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/button-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/button-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/button-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/checkbox-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/checkbox-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/checkbox-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/checkbox-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/combobox-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/combobox-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/combobox-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/combobox-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/dial-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/dial-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/dial-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/dial-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/frame-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/frame-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/frame-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/frame-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/groupbox-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/groupbox-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/groupbox-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/groupbox-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/itemdelegate-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/itemdelegate-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/itemdelegate-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/itemdelegate-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/label-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/label-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/label-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/label-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pageindicator-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pageindicator-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pageindicator-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pageindicator-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pane-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pane-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pane-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pane-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/placeholder-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/placeholder-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/placeholder-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/placeholder-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/progressbar-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/progressbar-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/progressbar-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/progressbar-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/radiobutton-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/radiobutton-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/radiobutton-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/radiobutton-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/slider-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/slider-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/slider-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/slider-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/spinbox-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/spinbox-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/spinbox-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/spinbox-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/switch-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/switch-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/switch-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/switch-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textarea-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textarea-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textarea-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textarea-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textfield-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textfield-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textfield-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textfield-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbar-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbar-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbar-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbar-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbutton-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbutton-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbutton-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbutton-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/tumbler-icon.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/tumbler-icon16.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/tumbler-icon16@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/images/tumbler-icon@2x.png
+%%QT_QMLDIR%%/Qt/labs/controls/designer/qtlabscontrols.metainfo
+%%QT_QMLDIR%%/Qt/labs/controls/libqtlabscontrolsplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/controls/libqtlabscontrolsplugin.so.debug
+%%QT_QMLDIR%%/Qt/labs/controls/material/ApplicationWindow.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/BusyIndicator.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Button.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/CheckBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/ComboBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Dial.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Drawer.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Frame.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/GroupBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/ItemDelegate.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Label.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Menu.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/MenuItem.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Page.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/PageIndicator.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Pane.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Popup.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/ProgressBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/RadioButton.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/RangeSlider.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Ripple.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/ScrollBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/ScrollIndicator.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Slider.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/SliderHandle.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/SpinBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/StackView.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/SwipeView.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Switch.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/TabBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/TabButton.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/TextArea.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/TextField.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/ToolBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/ToolButton.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/Tumbler.qml
+%%QT_QMLDIR%%/Qt/labs/controls/material/libqtlabsmaterialstyleplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/controls/material/libqtlabsmaterialstyleplugin.so.debug
+%%QT_QMLDIR%%/Qt/labs/controls/material/qmldir
+%%QT_QMLDIR%%/Qt/labs/controls/plugins.qmltypes
+%%QT_QMLDIR%%/Qt/labs/controls/qmldir
+%%QT_QMLDIR%%/Qt/labs/controls/universal/ApplicationWindow.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/BusyIndicator.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/Button.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/CheckBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/ComboBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/Dial.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/Frame.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/GroupBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/ItemDelegate.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/Label.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/Menu.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/MenuItem.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/Page.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/PageIndicator.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/Pane.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/Popup.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/ProgressBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/RadioButton.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/RangeSlider.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/ScrollBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/ScrollIndicator.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/Slider.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/SpinBox.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/StackView.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/Switch.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/TabBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/TabButton.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/TextArea.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/TextField.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/ToolBar.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/ToolButton.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/Tumbler.qml
+%%QT_QMLDIR%%/Qt/labs/controls/universal/libqtlabsuniversalstyleplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/controls/universal/libqtlabsuniversalstyleplugin.so.debug
+%%QT_QMLDIR%%/Qt/labs/controls/universal/qmldir
+%%QT_QMLDIR%%/Qt/labs/templates/libqtlabstemplatesplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/templates/libqtlabstemplatesplugin.so.debug
+%%QT_QMLDIR%%/Qt/labs/templates/plugins.qmltypes
+%%QT_QMLDIR%%/Qt/labs/templates/qmldir
diff --git a/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro b/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro
index 4a99dd42ed75..a3f89c7de392 100644
--- a/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro
+++ b/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro
@@ -1,11 +1,11 @@
 Only enter the directories we want to build, otherwise we might fail due to
 missing dependencies.
 
---- src/src.pro.orig	2015-10-13 04:38:15 UTC
+--- src/src.pro.orig	2016-02-24 21:26:49 UTC
 +++ src/src.pro
-@@ -1,37 +1,2 @@
+@@ -1,38 +1,3 @@
  TEMPLATE = subdirs
--
+ 
 -qtHaveModule(widgets) {
 -    no-png {
 -        message("Some graphics-related tools are unavailable without PNG support")
@@ -20,6 +20,7 @@ missing dependencies.
 -}
 -
 -SUBDIRS += linguist \
+-    qdoc \
 -    qtplugininfo
 -if(!android|android_app):!ios: SUBDIRS += qtpaths
 -
diff --git a/x11-toolkits/qt5-uiplugin/pkg-plist b/x11-toolkits/qt5-uiplugin/pkg-plist
index 497ebe54e1be..dbea79597cc0 100644
--- a/x11-toolkits/qt5-uiplugin/pkg-plist
+++ b/x11-toolkits/qt5-uiplugin/pkg-plist
@@ -9,4 +9,4 @@
 %%QT_INCDIR%%/QtUiPlugin/qtuipluginversion.h
 %%QT_LIBDIR%%/cmake/Qt5UiPlugin/Qt5UiPluginConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5UiPlugin/Qt5UiPluginConfigVersion.cmake
-%%QT_MKSPECDIR%%/modules/qt_%%QT_LIBDIR%%_uiplugin.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_uiplugin.pri
diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile
index ea390216f732..834497ebc346 100644
--- a/x11-toolkits/qt5-widgets/Makefile
+++ b/x11-toolkits/qt5-widgets/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	widgets
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/qt5-widgets/files/patch-cr-139066 b/x11-toolkits/qt5-widgets/files/patch-cr-139066
deleted file mode 100644
index 5fe07c079254..000000000000
--- a/x11-toolkits/qt5-widgets/files/patch-cr-139066
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0f68f8920573cdce1729a285a92ac8582df32841 Mon Sep 17 00:00:00 2001
-From: Ulf Hermann <ulf.hermann@theqtcompany.com>
-Date: Tue, 27 Oct 2015 15:25:42 +0100
-Subject: [PATCH] QtWidgets: Do hide/show via WA_OutsideWSRange for native
- widgets
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If a native widget has a width or height of 0 we don't have to
-invalidate its backing store as that is done by the window
-system. Certain applications rely on ... interesting ... behavior
-of certain window systems in this case.
-
-Task-number: QTBUG-48321
-Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c
-Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
-Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru>
-Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
-Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
----
- src/widgets/kernel/qwidget.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
-index 7734715..4286130 100644
---- src/widgets/kernel/qwidget.cpp
-+++ src/widgets/kernel/qwidget.cpp
-@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
-
-     bool needsShow = false;
-
--    if (q->isWindow()) {
-+    if (q->isWindow() || q->windowHandle()) {
-         if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
-             q->setAttribute(Qt::WA_OutsideWSRange, true);
-             if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
---
-2.8.1
-
diff --git a/x11-toolkits/qt5-widgets/pkg-plist b/x11-toolkits/qt5-widgets/pkg-plist
index 3877830c52b9..48010f559c4e 100644
--- a/x11-toolkits/qt5-widgets/pkg-plist
+++ b/x11-toolkits/qt5-widgets/pkg-plist
@@ -15,7 +15,7 @@
 %%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/qcolordialog_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qbuttongroup_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcolumnview_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcolumnviewgrip_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qcombobox_p.h