qt5: update to 5.10.0

2+ years worth of bug fixes and feature enhancements

11 files changed, 78 insertions, 135 deletions

diff --git a/x11/qt5-qttools/Makefile b/x11/qt5-qttools/Makefile
index 65545754ec6..84ccc601b64 100644
--- a/x11/qt5-qttools/Makefile
+++ b/x11/qt5-qttools/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.35 2018/01/17 19:30:48 markd Exp $
 
-DISTNAME=	qttools-opensource-src-${QTVERSION}
+DISTNAME=	qttools-everywhere-src-${QTVERSION}
 PKGNAME=	qt5-qttools-${QTVERSION}
-PKGREVISION=	15
 COMMENT=	Qt5 tools
 
 DEPENDS+=		xdg-utils-[0-9]*:../../misc/xdg-utils
@@ -24,6 +23,11 @@ post-install:
 .endfor
 
 .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
-.include "../../x11/qt5-qtwebkit/buildlink3.mk"
-.include "../../x11/qt5-sqlite3/buildlink3.mk"
+#.include "../../x11/qt5-qtwebkit/buildlink3.mk"
+#instead:
+.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
+.include "../../x11/qt5-qtlocation/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+.include "../../x11/qt5-qtsensors/buildlink3.mk"
+.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt5-qttools/PLIST b/x11/qt5-qttools/PLIST
index ca3356bd23a..bf69ca69367 100644
--- a/x11/qt5-qttools/PLIST
+++ b/x11/qt5-qttools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/10/26 19:04:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/01/17 19:30:48 markd Exp $
 lib/pkgconfig/Qt5CLucene.pc
 lib/pkgconfig/Qt5Designer.pc
 lib/pkgconfig/Qt5DesignerComponents.pc
@@ -19,33 +19,13 @@ qt5/bin/pixeltool
 qt5/bin/qcollectiongenerator
 qt5/bin/qdbus
 qt5/bin/qdbusviewer
+qt5/bin/qdoc
 qt5/bin/qhelpconverter
 qt5/bin/qhelpgenerator
+qt5/bin/qtattributionsscanner
 qt5/bin/qtdiag
 qt5/bin/qtpaths
 qt5/bin/qtplugininfo
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qanalyzer_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qclucene-config_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qclucene_global_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qdocument_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qfield_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qfilter_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qhits_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qindexreader_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qindexwriter_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qquery_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qqueryparser_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qreader_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qsearchable_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qsort_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qterm_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qtoken_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qtokenizer_p.h
-qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qtokenstream_p.h
-qt5/include/QtCLucene/QtCLucene
-qt5/include/QtCLucene/QtCLuceneDepends
-qt5/include/QtCLucene/QtCLuceneVersion
-qt5/include/QtCLucene/qtcluceneversion.h
 qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/abstractdialoggui_p.h
 qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/abstractintrospection_p.h
 qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/actioneditor_p.h
@@ -119,6 +99,7 @@ qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/qtresourceview_p.h
 qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/rcc_p.h
 qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/resourcebuilder_p.h
 qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/richtexteditor_p.h
+qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/selectsignaldialog_p.h
 qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/shared_enums_p.h
 qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/shared_global_p.h
 qt5/include/QtDesigner/${PKGVERSION}/QtDesigner/private/shared_settings_p.h
@@ -222,18 +203,14 @@ qt5/include/QtDesignerComponents/QtDesignerComponents
 qt5/include/QtDesignerComponents/QtDesignerComponentsDepends
 qt5/include/QtDesignerComponents/QtDesignerComponentsVersion
 qt5/include/QtDesignerComponents/qtdesignercomponentsversion.h
-qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qclucenefieldnames_p.h
 qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpcollectionhandler_p.h
 qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpdatainterface_p.h
 qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpdbreader_p.h
 qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpengine_p.h
 qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpgenerator_p.h
 qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpprojectdata_p.h
-qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpsearchindex_default_p.h
-qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpsearchindexreader_clucene_p.h
 qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpsearchindexreader_default_p.h
 qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpsearchindexreader_p.h
-qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpsearchindexwriter_clucene_p.h
 qt5/include/QtHelp/${PKGVERSION}/QtHelp/private/qhelpsearchindexwriter_default_p.h
 qt5/include/QtHelp/QHelpContentItem
 qt5/include/QtHelp/QHelpContentModel
@@ -246,6 +223,7 @@ qt5/include/QtHelp/QHelpIndexWidget
 qt5/include/QtHelp/QHelpSearchEngine
 qt5/include/QtHelp/QHelpSearchQuery
 qt5/include/QtHelp/QHelpSearchQueryWidget
+qt5/include/QtHelp/QHelpSearchResult
 qt5/include/QtHelp/QHelpSearchResultWidget
 qt5/include/QtHelp/QtHelp
 qt5/include/QtHelp/QtHelpDepends
@@ -278,7 +256,6 @@ qt5/include/QtUiTools/quiloader.h
 qt5/lib/cmake/Qt5Designer/Qt5DesignerConfig.cmake
 qt5/lib/cmake/Qt5Designer/Qt5DesignerConfigVersion.cmake
 qt5/lib/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
-qt5/lib/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
 qt5/lib/cmake/Qt5Help/Qt5HelpConfig.cmake
 qt5/lib/cmake/Qt5Help/Qt5HelpConfigExtras.cmake
 qt5/lib/cmake/Qt5Help/Qt5HelpConfigVersion.cmake
@@ -289,22 +266,26 @@ qt5/lib/cmake/Qt5UiPlugin/Qt5UiPluginConfig.cmake
 qt5/lib/cmake/Qt5UiPlugin/Qt5UiPluginConfigVersion.cmake
 qt5/lib/cmake/Qt5UiTools/Qt5UiToolsConfig.cmake
 qt5/lib/cmake/Qt5UiTools/Qt5UiToolsConfigVersion.cmake
-qt5/lib/libQt5CLucene.la
-qt5/lib/libQt5CLucene.prl
-qt5/lib/libQt5Designer.la
 qt5/lib/libQt5Designer.prl
-qt5/lib/libQt5DesignerComponents.la
+qt5/lib/libQt5Designer.so
+qt5/lib/libQt5Designer.so.${PKGVERSION}
+qt5/lib/libQt5Designer.so.5
+qt5/lib/libQt5Designer.so.5.10
 qt5/lib/libQt5DesignerComponents.prl
-qt5/lib/libQt5Help.la
+qt5/lib/libQt5DesignerComponents.so
+qt5/lib/libQt5DesignerComponents.so.${PKGVERSION}
+qt5/lib/libQt5DesignerComponents.so.5
+qt5/lib/libQt5DesignerComponents.so.5.10
 qt5/lib/libQt5Help.prl
-qt5/lib/libQt5UiTools.la
+qt5/lib/libQt5Help.so
+qt5/lib/libQt5Help.so.${PKGVERSION}
+qt5/lib/libQt5Help.so.5
+qt5/lib/libQt5Help.so.5.10
+qt5/lib/libQt5UiTools.a
 qt5/lib/libQt5UiTools.prl
-qt5/lib/pkgconfig/Qt5CLucene.pc
 qt5/lib/pkgconfig/Qt5Designer.pc
-qt5/lib/pkgconfig/Qt5DesignerComponents.pc
 qt5/lib/pkgconfig/Qt5Help.pc
 qt5/lib/pkgconfig/Qt5UiTools.pc
-qt5/mkspecs/modules/qt_lib_clucene_private.pri
 qt5/mkspecs/modules/qt_lib_designer.pri
 qt5/mkspecs/modules/qt_lib_designer_private.pri
 qt5/mkspecs/modules/qt_lib_designercomponents_private.pri
@@ -326,5 +307,4 @@ qt5/phrasebooks/polish.qph
 qt5/phrasebooks/russian.qph
 qt5/phrasebooks/spanish.qph
 qt5/phrasebooks/swedish.qph
-qt5/plugins/designer/libqquickwidget.la
-qt5/plugins/designer/libqwebview.la
+qt5/plugins/designer/libqquickwidget.so
diff --git a/x11/qt5-qttools/buildlink3.mk b/x11/qt5-qttools/buildlink3.mk
index e3009deaa46..36ff6d9177e 100644
--- a/x11/qt5-qttools/buildlink3.mk
+++ b/x11/qt5-qttools/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.28 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/01/17 19:30:48 markd Exp $
 
 BUILDLINK_TREE+=	qt5-qttools
 
 .if !defined(QT5_QTTOOLS_BUILDLINK3_MK)
 QT5_QTTOOLS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt5-qttools+=	qt5-qttools>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qttools+=	qt5-qttools>=5.5.1nb15
+BUILDLINK_API_DEPENDS.qt5-qttools+=	qt5-qttools>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qttools+=	qt5-qttools>=5.9.1
 BUILDLINK_PKGSRCDIR.qt5-qttools?=	../../x11/qt5-qttools
 
 BUILDLINK_INCDIRS.qt5-qttools+=	qt5/include
@@ -14,8 +14,13 @@ BUILDLINK_LIBDIRS.qt5-qttools+=	qt5/lib
 BUILDLINK_LIBDIRS.qt5-qttools+=	qt5/plugins
 
 .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
-.include "../../x11/qt5-qtwebkit/buildlink3.mk"
-.include "../../x11/qt5-sqlite3/buildlink3.mk"
+#.include "../../x11/qt5-qtwebkit/buildlink3.mk"
+#instead:
+.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
+.include "../../x11/qt5-qtlocation/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+.include "../../x11/qt5-qtsensors/buildlink3.mk"
+.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
 .endif	# QT5_QTTOOLS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-qt5-qttools
diff --git a/x11/qt5-qttools/distinfo b/x11/qt5-qttools/distinfo
index 942bf1993f7..90afc05b1ea 100644
--- a/x11/qt5-qttools/distinfo
+++ b/x11/qt5-qttools/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 19:30:48 markd Exp $
 
-SHA1 (qttools-opensource-src-5.5.1.tar.xz) = f7815165d0b427346028901a42be5f0f47d05962
-RMD160 (qttools-opensource-src-5.5.1.tar.xz) = 279aacc94f7fa583a59d3fe005ecb3e598e92b32
-SHA512 (qttools-opensource-src-5.5.1.tar.xz) = b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b
-Size (qttools-opensource-src-5.5.1.tar.xz) = 9327100 bytes
-SHA1 (patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 8161e4a61815b047f9c8b7c7a5578170db3a5eb7
-SHA1 (patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = dc741575811ee3f65d51c971c9907bd5eda3993a
-SHA1 (patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h) = b0b5c5c5c8fbd26fbf89899e4b32e35ccf946f83
-SHA1 (patch-src_assistant_clucene_qclucene-config__p.h) = 9c093ca76ae4eef6ba5622d4f2916d42813f4f1a
-SHA1 (patch-src_designer_src_uitools_uitools.pro) = f4879d5a8ac5c0fdc316656a2bd05f2dbb726231
+SHA1 (qttools-everywhere-src-5.10.0.tar.xz) = 0225b74589ca577260d4b4282e7ed15d0e05e85e
+RMD160 (qttools-everywhere-src-5.10.0.tar.xz) = 3becf8ae2a7e27255a8043fa3768d1f2c6b698e2
+SHA512 (qttools-everywhere-src-5.10.0.tar.xz) = 3a4a540d5e070bf46bcb922912bf9ec556761526104970bc76b84898de26de20dd836f02e9c5c58e73f6d12156555c6984716d54fe19361c1b6f247ee162ca06
+Size (qttools-everywhere-src-5.10.0.tar.xz) = 9822240 bytes
+SHA1 (patch-src_assistant_assistant_assistant.pro) = 924ccf851fe96f6838bbfe906793839b8a869ac4
+SHA1 (patch-src_designer_src_plugins_plugins.pro) = c82d154785e19ebfb3e191f08c8e7f9b07458d4a
diff --git a/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp b/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp
deleted file mode 100644
index 712b71c0101..00000000000
--- a/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $
-
---- src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp.orig	2013-11-27 01:01:52.000000000 +0000
-+++ src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
-@@ -264,7 +264,7 @@ int32_t SegmentMerger::mergeFields()
-     CND_CONDITION(fieldsWriter != NULL, "Memory allocation for fieldsWriter failed");
- 
-     try {  
--        IndexReader* reader = NULL;
-+        reader = NULL;
-         int32_t maxDoc          = 0;
-         //Iterate through all readers
-         for (uint32_t i = 0; i < readers.size(); i++) {
diff --git a/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp b/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp
deleted file mode 100644
index 64e3392447a..00000000000
--- a/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $
-
---- src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp.orig	2013-11-27 01:01:52.000000000 +0000
-+++ src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
-@@ -414,7 +414,7 @@ FieldCacheImpl::FileEntry::FileEntry (co
- 	  _CLDECDELETE(term);
- 
-       try {
--        Term* term = enumerator->term(false);
-+        term = enumerator->term(false);
-         if (term == NULL) {
-           _CLTHROWA(CL_ERR_Runtime,"no terms in field - cannot determine sort type"); //todo: make rich error: " + field + " 
-         }
diff --git a/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h b/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h
deleted file mode 100644
index a74de1be0f1..00000000000
--- a/x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h,v 1.1 2014/12/30 17:23:47 adam Exp $
-
---- src/assistant/3rdparty/clucene/src/CLucene/util/Arrays.h.orig	2013-11-27 01:01:52.000000000 +0000
-+++ src/assistant/3rdparty/clucene/src/CLucene/util/Arrays.h
-@@ -151,7 +151,7 @@ CL_NS_DEF(util)
- 
- 			_itr1 itr1 = val1->begin();
- 			_itr2 itr2 = val2->begin();
--			while ( --size >= 0 ){
-+			while ( size-- >= 0 ){
- 				if ( !comp(*itr1,*itr2) )
- 					return false;
- 				itr1++;
diff --git a/x11/qt5-qttools/patches/patch-src_assistant_assistant_assistant.pro b/x11/qt5-qttools/patches/patch-src_assistant_assistant_assistant.pro
new file mode 100644
index 00000000000..e55723a4fc5
--- /dev/null
+++ b/x11/qt5-qttools/patches/patch-src_assistant_assistant_assistant.pro
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_assistant_assistant_assistant.pro,v 1.1 2018/01/17 19:30:48 markd Exp $
+
+Don't build webkit dependent parts even if webkit detected.
+
+--- src/assistant/assistant/assistant.pro.orig	2017-06-23 12:03:39.000000000 +0000
++++ src/assistant/assistant/assistant.pro
+@@ -1,8 +1,8 @@
+-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
+-    BROWSER = qtwebkit
+-} else {
++#qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
++#    BROWSER = qtwebkit
++#} else {
+     BROWSER = qtextbrowser
+-}
++#}
+ 
+ QT += widgets network help sql help
+ qtHaveModule(printsupport): QT += printsupport
diff --git a/x11/qt5-qttools/patches/patch-src_assistant_clucene_qclucene-config__p.h b/x11/qt5-qttools/patches/patch-src_assistant_clucene_qclucene-config__p.h
deleted file mode 100644
index 38c6cf6d810..00000000000
--- a/x11/qt5-qttools/patches/patch-src_assistant_clucene_qclucene-config__p.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_assistant_clucene_qclucene-config__p.h,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Add NetBSD support
-
---- src/assistant/clucene/qclucene-config_p.h.orig	2013-11-27 01:01:52.000000000 +0000
-+++ src/assistant/clucene/qclucene-config_p.h
-@@ -94,7 +94,7 @@ configure.
- #define _CL_HAVE_FCNTL_H  1
- #endif
- 
--#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && \
-+#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && !defined(__NetBSD) && \
-     !defined(__HP_aCC) && !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) || \
-     defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x550) || (defined(__HP_aCC) && defined(__ia64))
-     /* Define to 1 if the system has the type `float_t'. */
-@@ -430,7 +430,7 @@ configure.
- #   endif
- #endif
- 
--#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC)
-+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC) || defined(__NetBSD__)
-     /* Define to 1 if you have a functioning <wchar.h> header file. */
- #   ifndef _CL_HAVE_WCTYPE_H
- #   define _CL_HAVE_WCTYPE_H
diff --git a/x11/qt5-qttools/patches/patch-src_designer_src_plugins_plugins.pro b/x11/qt5-qttools/patches/patch-src_designer_src_plugins_plugins.pro
new file mode 100644
index 00000000000..e9d44a6424b
--- /dev/null
+++ b/x11/qt5-qttools/patches/patch-src_designer_src_plugins_plugins.pro
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_designer_src_plugins_plugins.pro,v 1.1 2018/01/17 19:30:48 markd Exp $
+
+Don't build webkit dependent parts even if webkit detected.
+
+--- src/designer/src/plugins/plugins.pro.orig	2017-06-23 12:03:39.000000000 +0000
++++ src/designer/src/plugins/plugins.pro
+@@ -1,6 +1,6 @@
+ TEMPLATE = subdirs
+ 
+ # qtHaveModule(opengl): SUBDIRS += tools/view3d
+-qtHaveModule(webkitwidgets): SUBDIRS += qwebview
++#qtHaveModule(webkitwidgets): SUBDIRS += qwebview
+ win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
+ qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
diff --git a/x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro b/x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro
deleted file mode 100644
index 4555da61103..00000000000
--- a/x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_designer_src_uitools_uitools.pro,v 1.2 2015/10/26 19:04:00 adam Exp $
-
-* Libtoolized and build as shared library
-
---- src/designer/src/uitools/uitools.pro.orig	2015-10-13 04:38:12.000000000 +0000
-+++ src/designer/src/uitools/uitools.pro
-@@ -1,5 +1,5 @@
- TARGET = QtUiTools
--CONFIG += static
-+CONFIG +=
- 
- include(../lib/uilib/uilib.pri)
-