aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/Makefile2
-rw-r--r--x11-toolkits/qt5-canvas3d/Makefile23
-rw-r--r--x11-toolkits/qt5-canvas3d/pkg-plist25
-rw-r--r--x11-toolkits/qt5-declarative/Makefile1
-rw-r--r--x11-toolkits/qt5-gui/Makefile8
-rw-r--r--x11-toolkits/qt5-gui/files/patch-CVE-2015-029537
-rw-r--r--x11-toolkits/qt5-gui/files/patch-CVE-2015-185823
-rw-r--r--x11-toolkits/qt5-gui/files/patch-CVE-2015-185952
-rw-r--r--x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp23
-rw-r--r--x11-toolkits/qt5-gui/pkg-plist62
-rw-r--r--x11-toolkits/qt5-quick/Makefile1
-rw-r--r--x11-toolkits/qt5-quick/pkg-plist4
-rw-r--r--x11-toolkits/qt5-quickcontrols/Makefile2
-rw-r--r--x11-toolkits/qt5-quickcontrols/pkg-plist60
-rw-r--r--x11-toolkits/qt5-uiplugin/Makefile21
-rw-r--r--x11-toolkits/qt5-uiplugin/files/patch-src__src.pro44
-rw-r--r--x11-toolkits/qt5-uiplugin/files/patch-src_designer_src_src.pro30
-rw-r--r--x11-toolkits/qt5-uiplugin/pkg-plist12
-rw-r--r--x11-toolkits/qt5-widgets/pkg-plist51
19 files changed, 288 insertions, 193 deletions
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 9325e6cf1ffd..737b74203259 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -216,10 +216,12 @@
SUBDIR += qt4-declarative
SUBDIR += qt4-gui
SUBDIR += qt4pas
+ SUBDIR += qt5-canvas3d
SUBDIR += qt5-declarative
SUBDIR += qt5-gui
SUBDIR += qt5-quick
SUBDIR += qt5-quickcontrols
+ SUBDIR += qt5-uiplugin
SUBDIR += qt5-widgets
SUBDIR += qtada
SUBDIR += qwt5
diff --git a/x11-toolkits/qt5-canvas3d/Makefile b/x11-toolkits/qt5-canvas3d/Makefile
new file mode 100644
index 000000000000..a2b406837d1b
--- /dev/null
+++ b/x11-toolkits/qt5-canvas3d/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME= canvas3d
+DISTVERSION= ${QT5_VERSION}
+CATEGORIES= x11-toolkits
+PKGNAMEPREFIX= qt5-
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Qt canvas3d module
+
+USE_QT5= core gui network qml quick buildtools_build
+QT_DIST= ${PORTNAME}
+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
new file mode 100644
index 000000000000..88621c71a913
--- /dev/null
+++ b/x11-toolkits/qt5-canvas3d/pkg-plist
@@ -0,0 +1,25 @@
+%%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 9eaa60bc1837..7a0065698ca2 100644
--- a/x11-toolkits/qt5-declarative/Makefile
+++ b/x11-toolkits/qt5-declarative/Makefile
@@ -2,7 +2,6 @@
PORTNAME= declarative
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index f8d88f717be2..3bf04ae7d853 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -2,7 +2,6 @@
PORTNAME= gui
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 3
CATEGORIES= x11-toolkits graphics
PKGNAMEPREFIX= qt5-
@@ -23,11 +22,11 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
USES= jpeg
-USE_GL= gl
+USE_GL= gl egl
USE_GNOME= glib20
USE_QT5= core dbus qmake_build buildtools_build
QT_DIST= base
-USE_XORG= x11 xi xrender
+USE_XORG= ice sm x11 xi xrender
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-eglfs \
-no-evdev \
@@ -50,6 +49,9 @@ MORE_WRKSRCS= src/platformsupport \
MORE_WRKSRCS+= src/plugins/imageformats \
src/plugins/platforminputcontexts
+# openglextensions is the static library to use for further things like qtcanvas3d
+MORE_WRKSRCS+= src/openglextensions
+
QT_DEFINES= ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \
IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER
QT_CONFIG= accessibility accessibility-atspi-bridge dbus \
diff --git a/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 b/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295
deleted file mode 100644
index 5a32eb93b026..000000000000
--- a/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 661f6bfd032dacc62841037732816a583640e187
-Author: Richard J. Moore <rich@kde.org>
-Date: Sat Feb 21 17:43:21 2015 +0000
-
- Fix a division by zero when processing malformed BMP files.
-
- This fixes a division by 0 when processing a maliciously crafted BMP
- file. No impact beyond DoS.
-
- Task-number: QTBUG-44547
- Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973
- Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
- Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-
---- src/gui/image/qbmphandler.cpp
-+++ src/gui/image/qbmphandler.cpp
-@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
- }
- } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
- red_shift = calc_shift(red_mask);
-+ if (((red_mask >> red_shift) + 1) == 0)
-+ return false;
- red_scale = 256 / ((red_mask >> red_shift) + 1);
- green_shift = calc_shift(green_mask);
-+ if (((green_mask >> green_shift) + 1) == 0)
-+ return false;
- green_scale = 256 / ((green_mask >> green_shift) + 1);
- blue_shift = calc_shift(blue_mask);
-+ if (((blue_mask >> blue_shift) + 1) == 0)
-+ return false;
- blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
- alpha_shift = calc_shift(alpha_mask);
-+ if (((alpha_mask >> alpha_shift) + 1) == 0)
-+ return false;
- alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1);
- } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
- blue_mask = 0x000000ff;
diff --git a/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858 b/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858
deleted file mode 100644
index 066c8bba0870..000000000000
--- a/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d3048a29797ee2d80d84bbda26bb3c954584f332
-Author: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
-Date: Wed Mar 11 09:00:41 2015 +0100
-
- Fixes crash in gif image decoder
-
- Fuzzing test revealed that for certain malformed gif files,
- qgifhandler would segfault.
-
- Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1
- Reviewed-by: Richard J. Moore <rich@kde.org>
-
---- src/gui/image/qgifhandler.cpp
-+++ src/gui/image/qgifhandler.cpp
-@@ -936,6 +936,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co
-
- void QGIFFormat::nextY(unsigned char *bits, int bpl)
- {
-+ if (out_of_bounds)
-+ return;
- int my;
- switch (interlace) {
- case 0: // Non-interlaced
diff --git a/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859 b/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859
deleted file mode 100644
index 78066cba7a8c..000000000000
--- a/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859
+++ /dev/null
@@ -1,52 +0,0 @@
-commit 51ec7ebfe5f45d1c0a03d992e97053cac66e25fe
-Author: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
-Date: Wed Mar 11 13:34:01 2015 +0100
-
- Fixes crash in bmp and ico image decoding
-
- Fuzzing test revealed that for certain malformed bmp and ico files,
- the handler would segfault.
-
- Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe
- Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-
---- src/gui/image/qbmphandler.cpp
-+++ src/gui/image/qbmphandler.cpp
-@@ -484,12 +484,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
- p = data + (h-y-1)*bpl;
- break;
- case 2: // delta (jump)
-- // Protection
-- if ((uint)x >= (uint)w)
-- x = w-1;
-- if ((uint)y >= (uint)h)
-- y = h-1;
--
- {
- quint8 tmp;
- d->getChar((char *)&tmp);
-@@ -497,6 +491,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
- d->getChar((char *)&tmp);
- y += tmp;
- }
-+
-+ // Protection
-+ if ((uint)x >= (uint)w)
-+ x = w-1;
-+ if ((uint)y >= (uint)h)
-+ y = h-1;
-+
- p = data + (h-y-1)*bpl + x;
- break;
- default: // absolute mode
---- src/plugins/imageformats/ico/qicohandler.cpp
-+++ src/plugins/imageformats/ico/qicohandler.cpp
-@@ -567,7 +567,7 @@ QImage ICOReader::iconAt(int index)
- QImage::Format format = QImage::Format_ARGB32;
- if (icoAttrib.nbits == 24)
- format = QImage::Format_RGB32;
-- else if (icoAttrib.ncolors == 2)
-+ else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1)
- format = QImage::Format_Mono;
- else if (icoAttrib.ncolors > 0)
- format = QImage::Format_Indexed8;
diff --git a/x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp b/x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp
deleted file mode 100644
index 6b9e50bc9afe..000000000000
--- a/x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/plugins/platforms/xcb/qxcbwindow.cpp.orig 2015-01-29 15:05:03.094563565 -0500
-+++ src/plugins/platforms/xcb/qxcbwindow.cpp 2015-01-29 15:08:10.219554046 -0500
-@@ -701,6 +701,9 @@
- if (connection()->time() != XCB_TIME_CURRENT_TIME)
- updateNetWmUserTime(connection()->time());
-
-+ if (window()->objectName() == QLatin1String("QSystemTrayIconSysWindow"))
-+ return; // defer showing until XEMBED_EMBEDDED_NOTIFY
-+
- Q_XCB_CALL(xcb_map_window(xcb_connection(), m_window));
-
- if (QGuiApplication::modalWindow() == window())
-@@ -2130,7 +2133,10 @@
- switch (event->data.data32[1]) {
- case XEMBED_WINDOW_ACTIVATE:
- case XEMBED_WINDOW_DEACTIVATE:
-+ break;
- case XEMBED_EMBEDDED_NOTIFY:
-+ Q_XCB_CALL(xcb_map_window(xcb_connection(), m_window));
-+ m_screen->windowShown(this);
- break;
- case XEMBED_FOCUS_IN:
- Qt::FocusReason reason;
diff --git a/x11-toolkits/qt5-gui/pkg-plist b/x11-toolkits/qt5-gui/pkg-plist
index 26c257fb9e44..3de8fd33e47a 100644
--- a/x11-toolkits/qt5-gui/pkg-plist
+++ b/x11-toolkits/qt5-gui/pkg-plist
@@ -16,7 +16,6 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_mips_dsp_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_neon_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_p.h
-%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_sse_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_x86_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawingprimitive_sse2_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qemulationpaintengine_p.h
@@ -41,6 +40,8 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimage_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimagepixmapcleanuphooks_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimagescale_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputdevicemanager_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputdevicemanager_p_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputmethod_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qjpeghandler_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qkeymapper_p.h
@@ -72,7 +73,6 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglvertexarrayobject_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qoutlinemapper_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpagedpaintdevice_p.h
-%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintbuffer_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintdevicewindow_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_blitter_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_p.h
@@ -134,6 +134,8 @@
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformdialoghelper.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformdrag.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformfontdatabase.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformgraphicsbuffer.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformgraphicsbufferhelper.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatforminputcontext.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatforminputcontext_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatforminputcontextfactory_p.h
@@ -291,6 +293,10 @@
%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_2_Core
%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_3_Compatibility
%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_3_Core
+%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_4_Compatibility
+%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_4_Core
+%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_5_Compatibility
+%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_5_Core
%%QT_INCDIR%%/QtGui/QOpenGLFunctions_ES2
%%QT_INCDIR%%/QtGui/QOpenGLPaintDevice
%%QT_INCDIR%%/QtGui/QOpenGLPixelTransferOptions
@@ -323,6 +329,7 @@
%%QT_INCDIR%%/QtGui/QPixelFormat
%%QT_INCDIR%%/QtGui/QPixmap
%%QT_INCDIR%%/QtGui/QPixmapCache
+%%QT_INCDIR%%/QtGui/QPlatformSurfaceEvent
%%QT_INCDIR%%/QtGui/QPolygon
%%QT_INCDIR%%/QtGui/QPolygonF
%%QT_INCDIR%%/QtGui/QQuaternion
@@ -465,6 +472,10 @@
%%QT_INCDIR%%/QtGui/qopenglfunctions_4_2_core.h
%%QT_INCDIR%%/QtGui/qopenglfunctions_4_3_compatibility.h
%%QT_INCDIR%%/QtGui/qopenglfunctions_4_3_core.h
+%%QT_INCDIR%%/QtGui/qopenglfunctions_4_4_compatibility.h
+%%QT_INCDIR%%/QtGui/qopenglfunctions_4_4_core.h
+%%QT_INCDIR%%/QtGui/qopenglfunctions_4_5_compatibility.h
+%%QT_INCDIR%%/QtGui/qopenglfunctions_4_5_core.h
%%QT_INCDIR%%/QtGui/qopenglfunctions_es2.h
%%QT_INCDIR%%/QtGui/qopenglpaintdevice.h
%%QT_INCDIR%%/QtGui/qopenglpixeltransferoptions.h
@@ -524,6 +535,12 @@
%%QT_INCDIR%%/QtGui/qwindow.h
%%QT_INCDIR%%/QtGui/qwindowdefs.h
%%QT_INCDIR%%/QtGui/qwindowdefs_win.h
+%%QT_INCDIR%%/QtOpenGLExtensions/QOpenGLExtensions
+%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensions
+%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensionsDepends
+%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensionsVersion
+%%QT_INCDIR%%/QtOpenGLExtensions/qopenglextensions.h
+%%QT_INCDIR%%/QtOpenGLExtensions/qtopenglextensionsversion.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/application_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/atspiadaptor_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/bridge_p.h
@@ -535,14 +552,18 @@
%%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
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenutypes_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusplatformmenu_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbustrayicon_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbustraytypes_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_dummy_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_static_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_udev_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglcompositor_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglconvenience_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglpbuffer_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformbackingstore_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
@@ -554,7 +575,8 @@
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevmousehandler_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevmousemanager_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtablet_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtouch_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
@@ -570,8 +592,17 @@
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qgenericunixservices_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qgenericunixthemes_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qglxconvenience_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputhandler_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputkeyboard_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputpointer_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputtouch_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qmacmime_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qopenglcompositor_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qopenglcompositorbackingstore_p.h
+%%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/qxdgnotificationproxy_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qxlibeglintegration_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/struct_marshallers_p.h
%%QT_INCDIR%%/QtPlatformSupport/QtPlatformSupport
@@ -588,18 +619,33 @@
%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
+%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
+%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
+%%QT_LIBDIR%%/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake
+%%QT_LIBDIR%%/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake
%%QT_LIBDIR%%/libQt5Gui.prl
%%QT_LIBDIR%%/libQt5Gui.so
%%QT_LIBDIR%%/libQt5Gui.so.5
%%QT_LIBDIR%%/libQt5Gui.so.%%SHORTVER%%
%%QT_LIBDIR%%/libQt5Gui.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5Gui.so.%%FULLVER%%.debug
+%%QT_LIBDIR%%/libQt5OpenGLExtensions.a
+%%QT_LIBDIR%%/libQt5OpenGLExtensions.prl
%%QT_LIBDIR%%/libQt5PlatformSupport.a
%%QT_LIBDIR%%/libQt5PlatformSupport.prl
+%%QT_LIBDIR%%/libQt5XcbQpa.prl
+%%QT_LIBDIR%%/libQt5XcbQpa.so
+%%QT_LIBDIR%%/libQt5XcbQpa.so.5
+%%QT_LIBDIR%%/libQt5XcbQpa.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt5XcbQpa.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQt5XcbQpa.so.%%FULLVER%%.debug
%%QT_MKSPECDIR%%/modules/qt_lib_gui.pri
%%QT_MKSPECDIR%%/modules/qt_lib_gui_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_openglextensions.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_openglextensions_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_platformsupport_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_xcb_qpa_lib_private.pri
%%QT_PLUGINDIR%%/imageformats/libqgif.so
%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqgif.so.debug
%%QT_PLUGINDIR%%/imageformats/libqico.so
@@ -616,5 +662,11 @@
%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqoffscreen.so.debug
%%QT_PLUGINDIR%%/platforms/libqxcb.so
%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqxcb.so.debug
+%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so
+%%DEBUG%%%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so.debug
+%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-glx-integration.so
+%%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 c0d4b921fdee..8cf1e89e2ad7 100644
--- a/x11-toolkits/qt5-quick/Makefile
+++ b/x11-toolkits/qt5-quick/Makefile
@@ -8,6 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt declarative framework for dynamic user interfaces
+USE_GL= gl
USE_QT5= core gui network qml sql testlib \
widgets xmlpatterns buildtools_build
QT_DIST= declarative
diff --git a/x11-toolkits/qt5-quick/pkg-plist b/x11-toolkits/qt5-quick/pkg-plist
index 841bf9576199..c95c026228b6 100644
--- a/x11-toolkits/qt5-quick/pkg-plist
+++ b/x11-toolkits/qt5-quick/pkg-plist
@@ -1,7 +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/qqmlaccessible_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
@@ -83,6 +82,7 @@
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshadereffectmesh_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshadereffectnode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshadereffectsource_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshortcut_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicksmoothedanimation_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicksmoothedanimation_p_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickspringanimation_p.h
@@ -303,7 +303,6 @@
%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%.debug
%%QT_BINDIR%%/qml
-%%QT_BINDIR%%/qmlbundle
%%QT_BINDIR%%/qmleasing
%%QT_BINDIR%%/qmlimportscanner
%%QT_BINDIR%%/qmllint
@@ -333,6 +332,7 @@
%%QT_QMLDIR%%/Qt/labs/settings/qmldir
%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so.debug
+%%QT_QMLDIR%%/QtQml/Models.2/plugins.qmltypes
%%QT_QMLDIR%%/QtQml/Models.2/qmldir
%%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so
%%DEBUG%%%%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so.debug
diff --git a/x11-toolkits/qt5-quickcontrols/Makefile b/x11-toolkits/qt5-quickcontrols/Makefile
index 145fbeb87b08..403080927af3 100644
--- a/x11-toolkits/qt5-quickcontrols/Makefile
+++ b/x11-toolkits/qt5-quickcontrols/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Set of controls for building complete interfaces in Qt Quick
-USE_QT5= core gui qml quick testlib widgets \
+USE_QT5= core gui qml quick widgets \
buildtools_build
QT_DIST= quickcontrols
USES= qmake
diff --git a/x11-toolkits/qt5-quickcontrols/pkg-plist b/x11-toolkits/qt5-quickcontrols/pkg-plist
index 16f53d6929dc..a02b888a64e9 100644
--- a/x11-toolkits/qt5-quickcontrols/pkg-plist
+++ b/x11-toolkits/qt5-quickcontrols/pkg-plist
@@ -10,6 +10,7 @@
%%QT_QMLDIR%%/QtQuick/Controls/MenuBar.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/AbstractCheckable.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/BasicButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Private/BasicTableView.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/CalendarHeaderModel.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/CalendarUtils.js
%%QT_QMLDIR%%/QtQuick/Controls/Private/ColumnMenuContent.qml
@@ -33,11 +34,13 @@
%%QT_QMLDIR%%/QtQuick/Controls/Private/Style.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/SystemPaletteSingleton.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/TabBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Private/TableViewItemDelegateLoader.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/TableViewSelection.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/TextHandle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/TextInputWithHandles.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/TextSingleton.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/ToolMenuButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Private/TreeViewItemDelegateLoader.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/qmldir
%%QT_QMLDIR%%/QtQuick/Controls/Private/style.js
%%QT_QMLDIR%%/QtQuick/Controls/ProgressBar.qml
@@ -51,28 +54,43 @@
%%QT_QMLDIR%%/QtQuick/Controls/StackViewTransition.qml
%%QT_QMLDIR%%/QtQuick/Controls/StatusBar.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ApplicationWindowStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/BasicTableViewStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/BusyIndicatorStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ButtonStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CalendarStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CheckBoxStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CircularButtonStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CircularGaugeStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CircularTickmarkLabelStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ComboBoxStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CommonStyleHelper.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/DelayButtonStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/DialStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/FocusFrameStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/GaugeStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/GroupBoxStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/HandleStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/HandleStyleHelper.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/MenuBarStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/MenuStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/PieMenuStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ProgressBarStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/RadioButtonStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ScrollViewStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/SliderStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/SpinBoxStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/StatusBarStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/StatusIndicatorStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/SwitchStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TabViewStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TableViewStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TextAreaStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TextFieldStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ToggleButtonStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ToolBarStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ToolButtonStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TreeViewStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TumblerStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/arrow-down.png
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/arrow-down@2x.png
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/arrow-left.png
@@ -89,7 +107,9 @@
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/focusframe.png
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/groupbox.png
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/header.png
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/knob.png
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/leftanglearrow.png
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/needle.png
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/progress-indeterminate.png
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/rightanglearrow.png
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/scrollbar-handle-horizontal.png
@@ -126,7 +146,11 @@
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/TextFieldStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ToolBarStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ToolButtonStyle.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/TreeViewStyle.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/qmldir
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so.debug
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/qmldir
%%QT_QMLDIR%%/QtQuick/Controls/Styles/qmldir
%%QT_QMLDIR%%/QtQuick/Controls/Switch.qml
%%QT_QMLDIR%%/QtQuick/Controls/Tab.qml
@@ -137,12 +161,11 @@
%%QT_QMLDIR%%/QtQuick/Controls/TextField.qml
%%QT_QMLDIR%%/QtQuick/Controls/ToolBar.qml
%%QT_QMLDIR%%/QtQuick/Controls/ToolButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls/TreeView.qml
%%QT_QMLDIR%%/QtQuick/Controls/libqtquickcontrolsplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls/libqtquickcontrolsplugin.so.debug
%%QT_QMLDIR%%/QtQuick/Controls/plugins.qmltypes
%%QT_QMLDIR%%/QtQuick/Controls/qmldir
-%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so
-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so.debug
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultColorDialog.qml
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultDialogWrapper.qml
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultFileDialog.qml
@@ -166,6 +189,8 @@
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/sunken_frame.png
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/warning.png
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/window_border.png
+%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so.debug
%%QT_QMLDIR%%/QtQuick/Dialogs/plugins.qmltypes
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/ColorSlider.qml
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml
@@ -174,6 +199,37 @@
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/icons.ttf
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/qmldir
%%QT_QMLDIR%%/QtQuick/Dialogs/qmldir
+%%QT_QMLDIR%%/QtQuick/Extras/designer/CircularGaugeSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Extras/designer/DelayButtonSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Extras/designer/DialSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Extras/designer/GaugeSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Extras/designer/PictureSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Extras/designer/PieMenuSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Extras/designer/StatusIndicatorSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Extras/designer/ToggleButtonSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/circulargauge-icon.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/circulargauge-icon16.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/delaybutton-icon.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/delaybutton-icon16.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/dial-icon.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/dial-icon16.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/gauge-icon.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/gauge-icon16.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/picture-icon.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/picture-icon16.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/piemenu-icon.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/piemenu-icon16.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/statusindicator-icon.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/statusindicator-icon16.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/togglebutton-icon.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/togglebutton-icon16.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/tumbler-icon.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/images/tumbler-icon16.png
+%%QT_QMLDIR%%/QtQuick/Extras/designer/qtquickextras.metainfo
+%%QT_QMLDIR%%/QtQuick/Extras/libqtquickextrasplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Extras/libqtquickextrasplugin.so.debug
+%%QT_QMLDIR%%/QtQuick/Extras/plugins.qmltypes
+%%QT_QMLDIR%%/QtQuick/Extras/qmldir
%%QT_QMLDIR%%/QtQuick/Layouts/libqquicklayoutsplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Layouts/libqquicklayoutsplugin.so.debug
%%QT_QMLDIR%%/QtQuick/Layouts/plugins.qmltypes
diff --git a/x11-toolkits/qt5-uiplugin/Makefile b/x11-toolkits/qt5-uiplugin/Makefile
new file mode 100644
index 000000000000..3c1109b18368
--- /dev/null
+++ b/x11-toolkits/qt5-uiplugin/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME= uiplugin
+DISTVERSION= ${QT5_VERSION}
+CATEGORIES= x11-toolkits devel
+PKGNAMEPREFIX= qt5-
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Custom Qt widget plugin interface for Qt Designer
+
+# This port used to be part of qt5-designer itself before 5.5.0.
+CONFLICTS= qt5-designer-5.[0-4].*
+
+USE_QT5= core gui widgets
+QT_DIST= tools
+USES= qmake
+
+BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}
+INSTALL_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro b/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro
new file mode 100644
index 000000000000..4a99dd42ed75
--- /dev/null
+++ b/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro
@@ -0,0 +1,44 @@
+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
+@@ -1,37 +1,2 @@
+ TEMPLATE = subdirs
+-
+-qtHaveModule(widgets) {
+- no-png {
+- message("Some graphics-related tools are unavailable without PNG support")
+- } else {
+- SUBDIRS = assistant \
+- pixeltool \
+- qtestlib \
+- designer
+-
+- linguist.depends = designer
+- }
+-}
+-
+-SUBDIRS += linguist \
+- qtplugininfo
+-if(!android|android_app):!ios: SUBDIRS += qtpaths
+-
+-mac {
+- SUBDIRS += macdeployqt
+-}
+-
+-android {
+- SUBDIRS += androiddeployqt
+-}
+-
+-qtHaveModule(dbus): SUBDIRS += qdbus
+-
+-win32|winrt:SUBDIRS += windeployqt
+-winrt:SUBDIRS += winrtrunner
+-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
+-
+-qtNomakeTools( \
+- pixeltool \
+- macdeployqt \
+-)
++SUBDIRS = designer
diff --git a/x11-toolkits/qt5-uiplugin/files/patch-src_designer_src_src.pro b/x11-toolkits/qt5-uiplugin/files/patch-src_designer_src_src.pro
new file mode 100644
index 000000000000..e1661f6cc105
--- /dev/null
+++ b/x11-toolkits/qt5-uiplugin/files/patch-src_designer_src_src.pro
@@ -0,0 +1,30 @@
+Only enter the directories we want to build, otherwise we might fail due to
+missing dependencies.
+
+--- src/designer/src/src.pro.orig 2016-01-21 10:39:28 UTC
++++ src/designer/src/src.pro
+@@ -1,23 +1,4 @@
+ TEMPLATE = subdirs
+
+ SUBDIRS = \
+- uiplugin \
+- uitools \
+- lib \
+- components \
+- designer
+-
+-contains(QT_CONFIG, shared): SUBDIRS += plugins
+-
+-uitools.depends = uiplugin
+-lib.depends = uiplugin
+-components.depends = lib
+-designer.depends = components
+-plugins.depends = lib
+-
+-qtNomakeTools( \
+- lib \
+- components \
+- designer \
+- plugins \
+-)
++ uiplugin
diff --git a/x11-toolkits/qt5-uiplugin/pkg-plist b/x11-toolkits/qt5-uiplugin/pkg-plist
new file mode 100644
index 000000000000..497ebe54e1be
--- /dev/null
+++ b/x11-toolkits/qt5-uiplugin/pkg-plist
@@ -0,0 +1,12 @@
+%%QT_INCDIR%%/QtUiPlugin/QDesignerCustomWidgetCollectionInterface
+%%QT_INCDIR%%/QtUiPlugin/QDesignerCustomWidgetInterface
+%%QT_INCDIR%%/QtUiPlugin/QDesignerExportWidget
+%%QT_INCDIR%%/QtUiPlugin/QtUiPlugin
+%%QT_INCDIR%%/QtUiPlugin/QtUiPluginDepends
+%%QT_INCDIR%%/QtUiPlugin/QtUiPluginVersion
+%%QT_INCDIR%%/QtUiPlugin/customwidget.h
+%%QT_INCDIR%%/QtUiPlugin/qdesignerexportwidget.h
+%%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
diff --git a/x11-toolkits/qt5-widgets/pkg-plist b/x11-toolkits/qt5-widgets/pkg-plist
index 17acaf8c9548..16193d66122b 100644
--- a/x11-toolkits/qt5-widgets/pkg-plist
+++ b/x11-toolkits/qt5-widgets/pkg-plist
@@ -1,9 +1,14 @@
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/complexwidgets_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/itemviews_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractbutton_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractitemdelegate_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractitemview_p.h
%%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/qaccessiblemenu_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaccessiblewidgetfactory_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaccessiblewidgets_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
@@ -128,6 +133,8 @@
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowsxpstyle_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowsxpstyle_p_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwizard_win_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/rangecontrols_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/simplewidgets_p.h
%%QT_INCDIR%%/QtWidgets/QAbstractButton
%%QT_INCDIR%%/QtWidgets/QAbstractGraphicsShapeItem
%%QT_INCDIR%%/QtWidgets/QAbstractItemDelegate
@@ -135,45 +142,7 @@
%%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
@@ -387,17 +356,13 @@
%%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
@@ -521,8 +486,6 @@
%%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