3 files changed, 8 insertions, 7 deletions
diff --git a/devel/qt5-uitools/Makefile b/devel/qt5-uitools/Makefile
index efb0b8674156..623b02d98ad2 100644
--- a/devel/qt5-uitools/Makefile
+++ b/devel/qt5-uitools/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt Designer UI forms support module
 
-USE_QT5=	core widgets buildtools_build
+USE_QT5=	core gui uiplugin widgets buildtools_build
 QT_DIST=	tools
 USES=		qmake
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
diff --git a/devel/qt5-uitools/files/patch-src__designer__src__src.pro b/devel/qt5-uitools/files/patch-src__designer__src__src.pro
index 0e5f5694b57e..986de795bb49 100644
--- a/devel/qt5-uitools/files/patch-src__designer__src__src.pro
+++ b/devel/qt5-uitools/files/patch-src__designer__src__src.pro
@@ -3,10 +3,10 @@ missing dependencies.
 
 --- src/designer/src/src.pro
 +++ src/designer/src/src.pro
-@@ -1,20 +1,4 @@
- TEMPLATE = subdirs
+@@ -2,22 +2,4 @@ TEMPLATE = subdirs
  
  SUBDIRS = \
+     uiplugin \
 -    uitools \
 -    lib \
 -    components \
@@ -14,6 +14,8 @@ missing dependencies.
 -
 -contains(QT_CONFIG, shared): SUBDIRS += plugins
 -
+-uitools.depends = uiplugin
+-lib.depends = uiplugin
 -components.depends = lib
 -designer.depends = components
 -plugins.depends = lib
diff --git a/devel/qt5-uitools/files/patch-src__src.pro b/devel/qt5-uitools/files/patch-src__src.pro
index 9c21c99b3e22..42398d73a6f4 100644
--- a/devel/qt5-uitools/files/patch-src__src.pro
+++ b/devel/qt5-uitools/files/patch-src__src.pro
@@ -3,7 +3,7 @@ missing dependencies.
 
 --- src/src.pro
 +++ src/src.pro
-@@ -1,38 +1,2 @@
+@@ -1,37 +1,2 @@
  TEMPLATE = subdirs
 -
 -qtHaveModule(widgets) {
@@ -14,13 +14,13 @@ missing dependencies.
 -                  pixeltool \
 -                  qtestlib \
 -                  designer
--#    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
 -
 -        linguist.depends = designer
 -    }
 -}
 -
--SUBDIRS += linguist
+-SUBDIRS += linguist \
+-    qtplugininfo
 -if(!android|android_app):!ios: SUBDIRS += qtpaths
 -
 -mac {
@@ -39,7 +39,6 @@ missing dependencies.
 -
 -qtNomakeTools( \
 -    pixeltool \
--    qtconfig \
 -    macdeployqt \
 -)
 +SUBDIRS = designer