summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2018-01-17 19:30:46 +0000
committermarkd <markd@pkgsrc.org>2018-01-17 19:30:46 +0000
commit18c1dafceeaaf3a6a67945c099ee11fc0b21a590 (patch)
tree6dc8f194ce4b5a6a9b1def7a25dd4090a665259e
parent9e90447d08deb94c60ee7ccd0bdaa846ad13bb88 (diff)
downloadpkgsrc-18c1dafceeaaf3a6a67945c099ee11fc0b21a590.tar.gz
qt5: update to 5.10.0
2+ years worth of bug fixes and feature enhancements
-rw-r--r--x11/qt5-qtbase/Makefile76
-rw-r--r--x11/qt5-qtbase/Makefile.common14
-rw-r--r--x11/qt5-qtbase/PLIST900
-rw-r--r--x11/qt5-qtbase/PLIST.Darwin25
-rw-r--r--x11/qt5-qtbase/PLIST.Linux41
-rw-r--r--x11/qt5-qtbase/buildlink3.mk16
-rw-r--r--x11/qt5-qtbase/distinfo53
-rw-r--r--x11/qt5-qtbase/files/qmake.conf38
-rw-r--r--x11/qt5-qtbase/files/qmake.conf.mac44
-rw-r--r--x11/qt5-qtbase/options.mk32
-rw-r--r--x11/qt5-qtbase/patches/patch-config.tests_unix_iconv_iconv.cpp10
-rw-r--r--x11/qt5-qtbase/patches/patch-configure64
-rw-r--r--x11/qt5-qtbase/patches/patch-mkspecs_features_mac_objective__c.prf17
-rw-r--r--x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module.prf14
-rw-r--r--x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module__pris.prf15
-rw-r--r--x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf38
-rw-r--r--x11/qt5-qtbase/patches/patch-qmake_Makefile.unix53
-rw-r--r--x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp10
-rw-r--r--x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp78
-rw-r--r--x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp33
-rw-r--r--x11/qt5-qtbase/patches/patch-qmake_qmake.pri15
-rw-r--r--x11/qt5-qtbase/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp24
-rw-r--r--x11/qt5-qtbase/patches/patch-src_corelib_arch_sparc_arch.pri15
-rw-r--r--x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp37
-rw-r--r--x11/qt5-qtbase/patches/patch-src_corelib_global_qsystemdetection.h24
-rw-r--r--x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri10
-rw-r--r--x11/qt5-qtbase/patches/patch-src_corelib_io_qlockfile__unix.cpp40
-rw-r--r--x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp40
-rw-r--r--x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp18
-rw-r--r--x11/qt5-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp8
-rw-r--r--x11/qt5-qtbase/patches/patch-src_openglextensions_openglextensions.pro8
-rw-r--r--x11/qt5-qtbase/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri12
-rw-r--r--x11/qt5-qtbase/patches/patch-src_platformsupport_platformsupport.pro15
-rw-r--r--x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro10
-rw-r--r--x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp8
-rw-r--r--x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.h16
-rw-r--r--x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.mm35
-rw-r--r--x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro12
-rw-r--r--x11/qt5-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro6
-rw-r--r--x11/qt5-qtdeclarative/Makefile5
-rw-r--r--x11/qt5-qtdeclarative/PLIST330
-rw-r--r--x11/qt5-qtdeclarative/buildlink3.mk6
-rw-r--r--x11/qt5-qtdeclarative/distinfo13
-rw-r--r--x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_MathExtras.h15
-rw-r--r--x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp29
-rw-r--r--x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro17
-rw-r--r--x11/qt5-qtdoc/Makefile5
-rw-r--r--x11/qt5-qtdoc/PLIST65
-rw-r--r--x11/qt5-qtdoc/distinfo10
-rw-r--r--x11/qt5-qtgraphicaleffects/Makefile5
-rw-r--r--x11/qt5-qtgraphicaleffects/PLIST41
-rw-r--r--x11/qt5-qtgraphicaleffects/distinfo10
-rw-r--r--x11/qt5-qtimageformats/Makefile5
-rw-r--r--x11/qt5-qtimageformats/PLIST18
-rw-r--r--x11/qt5-qtimageformats/buildlink3.mk6
-rw-r--r--x11/qt5-qtimageformats/distinfo10
-rw-r--r--x11/qt5-qtlocation/Makefile5
-rw-r--r--x11/qt5-qtlocation/PLIST101
-rw-r--r--x11/qt5-qtlocation/PLIST.Darwin3
-rw-r--r--x11/qt5-qtlocation/PLIST.Linux3
-rw-r--r--x11/qt5-qtlocation/buildlink3.mk6
-rw-r--r--x11/qt5-qtlocation/distinfo10
-rw-r--r--x11/qt5-qtmultimedia/Makefile5
-rw-r--r--x11/qt5-qtmultimedia/PLIST95
-rw-r--r--x11/qt5-qtmultimedia/PLIST.Darwin5
-rw-r--r--x11/qt5-qtmultimedia/buildlink3.mk8
-rw-r--r--x11/qt5-qtmultimedia/distinfo12
-rw-r--r--x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp15
-rw-r--r--x11/qt5-qtmultimedia/patches/patch-qtmultimedia.pro26
-rw-r--r--x11/qt5-qtquickcontrols/Makefile5
-rw-r--r--x11/qt5-qtquickcontrols/PLIST223
-rw-r--r--x11/qt5-qtquickcontrols/buildlink3.mk6
-rw-r--r--x11/qt5-qtquickcontrols/distinfo10
-rw-r--r--x11/qt5-qtscript/Makefile5
-rw-r--r--x11/qt5-qtscript/PLIST12
-rw-r--r--x11/qt5-qtscript/buildlink3.mk6
-rw-r--r--x11/qt5-qtscript/distinfo10
-rw-r--r--x11/qt5-qtsensors/Makefile5
-rw-r--r--x11/qt5-qtsensors/PLIST27
-rw-r--r--x11/qt5-qtsensors/PLIST.Darwin3
-rw-r--r--x11/qt5-qtsensors/buildlink3.mk6
-rw-r--r--x11/qt5-qtsensors/distinfo10
-rw-r--r--x11/qt5-qtserialport/Makefile5
-rw-r--r--x11/qt5-qtserialport/PLIST8
-rw-r--r--x11/qt5-qtserialport/buildlink3.mk8
-rw-r--r--x11/qt5-qtserialport/distinfo10
-rw-r--r--x11/qt5-qtsvg/Makefile5
-rw-r--r--x11/qt5-qtsvg/PLIST12
-rw-r--r--x11/qt5-qtsvg/buildlink3.mk8
-rw-r--r--x11/qt5-qtsvg/distinfo10
-rw-r--r--x11/qt5-qttools/Makefile14
-rw-r--r--x11/qt5-qttools/PLIST58
-rw-r--r--x11/qt5-qttools/buildlink3.mk15
-rw-r--r--x11/qt5-qttools/distinfo17
-rw-r--r--x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp13
-rw-r--r--x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp13
-rw-r--r--x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h13
-rw-r--r--x11/qt5-qttools/patches/patch-src_assistant_assistant_assistant.pro19
-rw-r--r--x11/qt5-qttools/patches/patch-src_assistant_clucene_qclucene-config__p.h24
-rw-r--r--x11/qt5-qttools/patches/patch-src_designer_src_plugins_plugins.pro14
-rw-r--r--x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro13
-rw-r--r--x11/qt5-qttranslations/Makefile5
-rw-r--r--x11/qt5-qttranslations/PLIST80
-rw-r--r--x11/qt5-qttranslations/distinfo10
-rw-r--r--x11/qt5-qtwebchannel/Makefile5
-rw-r--r--x11/qt5-qtwebchannel/PLIST9
-rw-r--r--x11/qt5-qtwebchannel/buildlink3.mk8
-rw-r--r--x11/qt5-qtwebchannel/distinfo10
-rw-r--r--x11/qt5-qtwebsockets/Makefile8
-rw-r--r--x11/qt5-qtwebsockets/PLIST10
-rw-r--r--x11/qt5-qtwebsockets/buildlink3.mk12
-rw-r--r--x11/qt5-qtwebsockets/distinfo10
-rw-r--r--x11/qt5-qtx11extras/Makefile5
-rw-r--r--x11/qt5-qtx11extras/PLIST7
-rw-r--r--x11/qt5-qtx11extras/buildlink3.mk6
-rw-r--r--x11/qt5-qtx11extras/distinfo10
-rw-r--r--x11/qt5-qtxmlpatterns/Makefile6
-rw-r--r--x11/qt5-qtxmlpatterns/PLIST9
-rw-r--r--x11/qt5-qtxmlpatterns/buildlink3.mk6
-rw-r--r--x11/qt5-qtxmlpatterns/distinfo10
-rw-r--r--x11/qt5/Makefile11
-rw-r--r--x11/qt5/Makefile.common6
122 files changed, 1866 insertions, 1792 deletions
diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile
index 0ef0d7f6d7c..1bf0de05692 100644
--- a/x11/qt5-qtbase/Makefile
+++ b/x11/qt5-qtbase/Makefile
@@ -1,59 +1,60 @@
-# $NetBSD: Makefile,v 1.49 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: Makefile,v 1.50 2018/01/17 19:30:46 markd Exp $
-DISTNAME= qtbase-opensource-src-${QTVERSION}
+DISTNAME= qtbase-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtbase-${QTVERSION}
-PKGREVISION= 18
COMMENT= C++ X GUI toolkit
.include "../../x11/qt5-qtbase/Makefile.common"
-.if defined(MAKE_JOBS)
-. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
-CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q}
-. endif
-.endif
HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= -optimized-qmake
CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
-CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
CONFIGURE_ARGS+= -opensource -confirm-license
CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
CONFIGURE_ARGS+= -accessibility
CONFIGURE_ARGS+= -dbus-linked
-CONFIGURE_ARGS+= -fontconfig
-CONFIGURE_ARGS+= -force-pkg-config
CONFIGURE_ARGS+= -icu
+CONFIGURE_ARGS+= -libproxy
CONFIGURE_ARGS+= -openssl-linked
CONFIGURE_ARGS+= -nomake examples
CONFIGURE_ARGS+= -nomake tests
CONFIGURE_ARGS+= -no-pch
-CONFIGURE_ARGS+= -no-sql-db2
-CONFIGURE_ARGS+= -no-sql-ibase
+CONFIGURE_ARGS+= -no-sql-db2
+CONFIGURE_ARGS+= -no-sql-ibase
CONFIGURE_ARGS+= -no-sql-mysql
-CONFIGURE_ARGS+= -no-sql-oci
-CONFIGURE_ARGS+= -no-sql-odbc
+CONFIGURE_ARGS+= -no-sql-oci
+CONFIGURE_ARGS+= -no-sql-odbc
CONFIGURE_ARGS+= -no-sql-psql
-CONFIGURE_ARGS+= -no-sql-sqlite
-CONFIGURE_ARGS+= -no-sql-sqlite2
+#CONFIGURE_ARGS+= -no-sql-sqlite
+CONFIGURE_ARGS+= -no-sql-sqlite2
CONFIGURE_ARGS+= -no-sql-tds
CONFIGURE_ARGS+= -no-strip
+CONFIGURE_ARGS+= -no-use-gold-linker
+CONFIGURE_ARGS+= -pkg-config
+CONFIGURE_ARGS+= -release
+CONFIGURE_ARGS+= -shared
CONFIGURE_ARGS+= -system-harfbuzz
CONFIGURE_ARGS+= -system-libjpeg
CONFIGURE_ARGS+= -system-libpng
CONFIGURE_ARGS+= -system-pcre
CONFIGURE_ARGS+= -system-sqlite
CONFIGURE_ARGS+= -system-zlib
+.if defined(MAKE_JOBS)
+. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
+CONFIGURE_ENV+= MAKEFLAGS=-j${MAKE_JOBS}
+. endif
+.endif
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "Darwin"
-CONFIGURE_ARGS+= -iconv
+CONFIGURE_ARGS+= -fontconfig
QMAKE_CONF= qmake.conf
. if ${OPSYS} != "SunOS" && \
(!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
CONFIGURE_ARGS+= -reduce-relocations
. endif
.else
+CONFIGURE_ARGS+= -no-rpath # avoid @rpath in dylibs
QMAKE_CONF= qmake.conf.mac
.endif
@@ -99,11 +100,10 @@ LDFLAGS+= -lexecinfo
. endif
LDFLAGS.FreeBSD+= -lutil
.endif
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
-LDFLAGS+= -lkvm # see patch-src_corelib_io_qlockfile__unix.cpp
-.endif
+REPLACE_PERL+= bin/fixqt4headers.pl
REPLACE_PERL+= bin/syncqt.pl
+REPLACE_PERL+= mkspecs/features/uikit/devices.pl
PTHREAD_OPTS+= require
UNLIMIT_RESOURCES= datasize
@@ -120,32 +120,36 @@ CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro
CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro
+CHECK_INTERPRETER_SKIP+=qt5/mkspecs/features/data/mac/objc_namespace.sh
+CHECK_INTERPRETER_SKIP+=qt5/mkspecs/features/uikit/device_destinations.sh
+CHECK_INTERPRETER_SKIP+=qt5/mkspecs/features/uikit/devices.py
CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh
-SUBST_CLASSES+= opt path
+SUBST_CLASSES+= opt
SUBST_STAGE.opt= pre-configure
SUBST_MESSAGE.opt= Removing some Qt5 default compiler flags.
SUBST_FILES.opt= mkspecs/common/gcc-base.conf
-SUBST_SED.opt= -e 's,-O[23],,'
+SUBST_SED.opt= -e 's,-O[s23],,'
SUBST_SED.opt+= -e 's,-fvisibility=hidden,,'
+SUBST_CLASSES+= path
SUBST_STAGE.path= pre-configure
SUBST_MESSAGE.path= Add to default XDG path.
SUBST_FILES.path= src/corelib/io/qstandardpaths_unix.cpp
SUBST_VARS.path= LOCALBASE
BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
+BROKEN_FILES1= qt5/mkspecs/qmodule.pri
-PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \
+PC_FILES= Qt5Concurrent.pc Qt5Core.pc Qt5DBus.pc \
Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \
- Qt5OpenGLExtensions.pc Qt5PlatformSupport.pc \
+ Qt5OpenGLExtensions.pc \
Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \
Qt5Widgets.pc Qt5Xml.pc
pre-configure:
${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \
-e 's:@X11BASE@:${X11BASE}:g' \
- -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
-e 's:@CC@:${CC:Q}:g' \
-e 's:@CXX@:${CXX:Q}:g' \
-e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
@@ -167,10 +171,7 @@ pre-configure:
rm -f $${dir}/*.orig; \
done
${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf
- ${RM} -f ${WRKSRC}/mkspecs/features/mac/objective_c.prf.orig
-
-post-configure:
- cd ${WRKSRC} && ./bin/qmake -o Makefile
+ ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_post.prf
post-install:
.for i in ${PC_FILES}
@@ -185,13 +186,18 @@ post-install:
> ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1
${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \
${DESTDIR}${PREFIX}/${BROKEN_FILES}
+ ${SED} -e 's,PKG_CONFIG_EXECUTABLE = .*,PKG_CONFIG_EXECUTABLE = ${TOOLS_PATH.pkg-config},' \
+ ${DESTDIR}${PREFIX}/${BROKEN_FILES1} \
+ > ${DESTDIR}${PREFIX}/${BROKEN_FILES1}.1
+ ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES1}.1 \
+ ${DESTDIR}${PREFIX}/${BROKEN_FILES1}
.include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../fonts/harfbuzz/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
@@ -200,7 +206,9 @@ post-install:
USE_DBUS-ARCH-DEPS_H= yes
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
+.include "../../www/libproxy/buildlink3.mk"
.if ${OPSYS} != "Darwin"
+.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
. if !empty(MESALIB_SUPPORTS_EGL:Myes)
PLIST.egl= yes
@@ -209,12 +217,14 @@ PLIST.egl= yes
.include "../../x11/xcb-util/buildlink3.mk"
.include "../../x11/xcb-util-image/buildlink3.mk"
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
+.include "../../x11/xcb-util-renderutil/buildlink3.mk"
.include "../../x11/xcb-util-wm/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXcursor/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common
index 2e93b2b78fd..6f0917b703c 100644
--- a/x11/qt5-qtbase/Makefile.common
+++ b/x11/qt5-qtbase/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2017/05/03 08:38:46 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.22 2018/01/17 19:30:46 markd Exp $
# used by x11/qt5-mysql/Makefile
# used by x11/qt5-odbc/Makefile
# used by x11/qt5-psql/Makefile
@@ -32,7 +32,6 @@
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
USE_LANGUAGES= c c++11
-USE_LIBTOOL= yes
USE_TOOLS+= gmake perl:build pkg-config
# wcstof(3) etc. is used in C++ code.
@@ -46,19 +45,22 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${PREFIX}/qt5/lib
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${WRKSRC}/lib
MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
-PLIST_VARS+= mac unix
+PLIST_VARS+= jit mac unix
.if ${OPSYS} == "Darwin"
PLIST.mac= yes
.else
PLIST.unix= yes
.endif
+.if ${OPSYS} != "NetBSD"
+PLIST.jit= yes
+.endif
# avoid creating a .qt directory in the users home directory
SCRIPTS_ENV+= HOME=${WRKDIR}
-.if empty(PKGPATH:Mx11/qt5-qtbase) \
- && empty(PKGPATH:Mx11/qt5-odbc) && empty(PKGPATH:Mx11/qt5-mysql) \
- && empty(PKGPATH:Mx11/qt5-psql) && empty(PKGPATH:Mx11/qt5-sqlite3)
+.if empty(PKGPATH:Mwip/qt5-qtbase) \
+ && empty(PKGPATH:Mwip/qt5-odbc) && empty(PKGPATH:Mwip/qt5-mysql) \
+ && empty(PKGPATH:Mwip/qt5-psql) && empty(PKGPATH:Mwip/qt5-sqlite3)
do-configure:
cd ${WRKSRC} && ${QTPREFIX}/bin/qmake -o Makefile
.endif
diff --git a/x11/qt5-qtbase/PLIST b/x11/qt5-qtbase/PLIST
index 51ab75ba6d5..3b5a4b3b1a7 100644
--- a/x11/qt5-qtbase/PLIST
+++ b/x11/qt5-qtbase/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.11 2016/01/18 20:52:43 nros Exp $
-lib/pkgconfig/Qt5Bootstrap.pc
+@comment $NetBSD: PLIST,v 1.12 2018/01/17 19:30:46 markd Exp $
lib/pkgconfig/Qt5Concurrent.pc
lib/pkgconfig/Qt5Core.pc
+lib/pkgconfig/Qt5DBus.pc
lib/pkgconfig/Qt5Gui.pc
lib/pkgconfig/Qt5Network.pc
lib/pkgconfig/Qt5OpenGL.pc
lib/pkgconfig/Qt5OpenGLExtensions.pc
-lib/pkgconfig/Qt5PlatformSupport.pc
lib/pkgconfig/Qt5PrintSupport.pc
lib/pkgconfig/Qt5Sql.pc
lib/pkgconfig/Qt5Test.pc
lib/pkgconfig/Qt5Widgets.pc
lib/pkgconfig/Qt5Xml.pc
+qt5/bin/fixqt4headers.pl
qt5/bin/moc
qt5/bin/qdbuscpp2xml
qt5/bin/qdbusxml2cpp
-qt5/bin/qdoc
qt5/bin/qlalr
qt5/bin/qmake
+qt5/bin/qvkgen
qt5/bin/rcc
qt5/bin/syncqt.pl
qt5/bin/uic
@@ -39,6 +39,7 @@ qt5/doc/global/includes/examples-run.qdocinc
qt5/doc/global/macros.qdocconf
qt5/doc/global/manifest-meta.qdocconf
qt5/doc/global/qt-cpp-defines.qdocconf
+qt5/doc/global/qt-html-templates-offline-simple.qdocconf
qt5/doc/global/qt-html-templates-offline.qdocconf
qt5/doc/global/qt-html-templates-online.qdocconf
qt5/doc/global/qt-module-defaults-offline.qdocconf
@@ -91,9 +92,16 @@ qt5/doc/global/template/style/icomoon.svg
qt5/doc/global/template/style/icomoon.ttf
qt5/doc/global/template/style/icomoon.woff
qt5/doc/global/template/style/list_arrow.png
+qt5/doc/global/template/style/list_expand.png
+qt5/doc/global/template/style/offline-simple.css
qt5/doc/global/template/style/offline.css
qt5/doc/global/template/style/online.css
qt5/doc/global/template/style/theqtcompany.png
+qt5/include/QtAccessibilitySupport/${PKGVERSION}/QtAccessibilitySupport/private/qaccessiblebridgeutils_p.h
+qt5/include/QtAccessibilitySupport/QtAccessibilitySupport
+qt5/include/QtAccessibilitySupport/QtAccessibilitySupportDepends
+qt5/include/QtAccessibilitySupport/QtAccessibilitySupportVersion
+qt5/include/QtAccessibilitySupport/qtaccessibilitysupportversion.h
qt5/include/QtConcurrent/QtConcurrent
qt5/include/QtConcurrent/QtConcurrentDepends
qt5/include/QtConcurrent/QtConcurrentFilter
@@ -117,6 +125,7 @@ qt5/include/QtConcurrent/qtconcurrentstoredfunctioncall.h
qt5/include/QtConcurrent/qtconcurrentthreadengine.h
qt5/include/QtConcurrent/qtconcurrentversion.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/cp949codetbl_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/minimum-linux_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qabstractanimation_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qabstracteventdispatcher_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qabstractfileengine_p.h
@@ -126,24 +135,29 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qabstractstate_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qabstracttransition_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qanimationgroup_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qbig5codec_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qbytearray_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qbytedata_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qcfsocketnotifier_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qcollator_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qconfig_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qcore_mac_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qcore_unix_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qcoreapplication_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qcorecmdlineargs_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qcoreglobaldata_p.h
-qt5/include/QtCore/${PKGVERSION}/QtCore/private/qcrashhandler_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdatastream_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdataurl_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdatetime_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdatetimeparser_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdeadlinetimer_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdebug_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdir_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdoublescanprint_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qelfparser_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qendian_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeucjpcodec_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeuckrcodec_p.h
-qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventdispatcher_blackberry_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventdispatcher_cf_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventdispatcher_glib_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventdispatcher_unix_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeventdispatcher_win_p.h
@@ -165,13 +179,17 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemwatcher_kqueue_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemwatcher_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemwatcher_polling_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfilesystemwatcher_win_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfinalstate_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfloat16_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfreelist_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfsfileengine_iterator_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfsfileengine_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfunctions_fake_env_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfunctions_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfutureinterface_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qfuturewatcher_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qgb18030codec_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qglobal_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qharfbuzz_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qhistorystate_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qhooks_p.h
@@ -213,15 +231,17 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qmutexpool_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qnoncontiguousbytedevice_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qnumeric_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qobject_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qoperatingsystemversion_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qorderedmutexlocker_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qparallelanimationgroup_p.h
-qt5/include/QtCore/${PKGVERSION}/QtCore/private/qpodlist_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qpoll_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qppsattribute_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qppsattributeprivate_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qppsobject_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qppsobjectprivate_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qprocess_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qpropertyanimation_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qrandom_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qreadwritelock_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qresource_iterator_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qresource_p.h
@@ -245,6 +265,7 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qsystemerror_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qsystemlibrary_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qsystemsemaphore_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qt_pch.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qtcore-config_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qtemporaryfile_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qtextcodec_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qtextstream_p.h
@@ -264,11 +285,10 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qurltlds_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qutfcodec_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qvariant_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qvariantanimation_p.h
-qt5/include/QtCore/${PKGVERSION}/QtCore/private/qversionnumber_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qwindowscodec_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qwindowspipereader_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qwindowspipewriter_p.h
-qt5/include/QtCore/${PKGVERSION}/QtCore/private/qwinoverlappedionotifier_p.h
+qt5/include/QtCore/${PKGVERSION}/QtCore/private/qwineventnotifier_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qxmlstream_p.h
qt5/include/QtCore/${PKGVERSION}/QtCore/private/qxmlutils_p.h
qt5/include/QtCore/QAbstractAnimation
@@ -290,9 +310,10 @@ qt5/include/QtCore/QAssociativeIterable
qt5/include/QtCore/QAtomicInt
qt5/include/QtCore/QAtomicInteger
qt5/include/QtCore/QAtomicPointer
-qt5/include/QtCore/QBBSystemLocaleData
+qt5/include/QtCore/QBEInteger
qt5/include/QtCore/QBasicMutex
qt5/include/QtCore/QBasicTimer
+qt5/include/QtCore/QBigEndianStorageType
qt5/include/QtCore/QBitArray
qt5/include/QtCore/QBitRef
qt5/include/QtCore/QBuffer
@@ -311,6 +332,7 @@ qt5/include/QtCore/QCollator
qt5/include/QtCore/QCollatorSortKey
qt5/include/QtCore/QCommandLineOption
qt5/include/QtCore/QCommandLineParser
+qt5/include/QtCore/QConstOverload
qt5/include/QtCore/QContiguousCache
qt5/include/QtCore/QContiguousCacheData
qt5/include/QtCore/QContiguousCacheTypedData
@@ -319,6 +341,7 @@ qt5/include/QtCore/QCryptographicHash
qt5/include/QtCore/QDataStream
qt5/include/QtCore/QDate
qt5/include/QtCore/QDateTime
+qt5/include/QtCore/QDeadlineTimer
qt5/include/QtCore/QDebug
qt5/include/QtCore/QDebugStateSaver
qt5/include/QtCore/QDeferredDeleteEvent
@@ -344,7 +367,7 @@ qt5/include/QtCore/QFileSystemWatcher
qt5/include/QtCore/QFinalState
qt5/include/QtCore/QFlag
qt5/include/QtCore/QFlags
-qt5/include/QtCore/QForeachContainer
+qt5/include/QtCore/QFloat16
qt5/include/QtCore/QFunctionPointer
qt5/include/QtCore/QFuture
qt5/include/QtCore/QFutureInterface
@@ -359,6 +382,7 @@ qt5/include/QtCore/QGlobalStatic
qt5/include/QtCore/QHash
qt5/include/QtCore/QHashData
qt5/include/QtCore/QHashDummyValue
+qt5/include/QtCore/QHashFunctions
qt5/include/QtCore/QHashIterator
qt5/include/QtCore/QHashNode
qt5/include/QtCore/QHistoryState
@@ -378,6 +402,8 @@ qt5/include/QtCore/QJsonValue
qt5/include/QtCore/QJsonValuePtr
qt5/include/QtCore/QJsonValueRef
qt5/include/QtCore/QJsonValueRefPtr
+qt5/include/QtCore/QKeyValueIterator
+qt5/include/QtCore/QLEInteger
qt5/include/QtCore/QLatin1Char
qt5/include/QtCore/QLatin1Literal
qt5/include/QtCore/QLatin1String
@@ -393,6 +419,7 @@ qt5/include/QtCore/QList
qt5/include/QtCore/QListData
qt5/include/QtCore/QListIterator
qt5/include/QtCore/QListSpecialMethods
+qt5/include/QtCore/QLittleEndianStorageType
qt5/include/QtCore/QLocale
qt5/include/QtCore/QLockFile
qt5/include/QtCore/QLoggingCategory
@@ -413,9 +440,6 @@ qt5/include/QtCore/QMetaMethod
qt5/include/QtCore/QMetaObject
qt5/include/QtCore/QMetaProperty
qt5/include/QtCore/QMetaType
-qt5/include/QtCore/QMetaTypeId
-qt5/include/QtCore/QMetaTypeId2
-qt5/include/QtCore/QMetaTypeIdQObject
qt5/include/QtCore/QMimeData
qt5/include/QtCore/QMimeDatabase
qt5/include/QtCore/QMimeType
@@ -435,11 +459,13 @@ qt5/include/QtCore/QMutableVectorIterator
qt5/include/QtCore/QMutex
qt5/include/QtCore/QMutexLocker
qt5/include/QtCore/QNoDebug
+qt5/include/QtCore/QNonConstOverload
qt5/include/QtCore/QObject
qt5/include/QtCore/QObjectCleanupHandler
qt5/include/QtCore/QObjectData
qt5/include/QtCore/QObjectList
qt5/include/QtCore/QObjectUserData
+qt5/include/QtCore/QOperatingSystemVersion
qt5/include/QtCore/QPair
qt5/include/QtCore/QParallelAnimationGroup
qt5/include/QtCore/QPauseAnimation
@@ -452,6 +478,8 @@ qt5/include/QtCore/QProcess
qt5/include/QtCore/QProcessEnvironment
qt5/include/QtCore/QPropertyAnimation
qt5/include/QtCore/QQueue
+qt5/include/QtCore/QRandomGenerator
+qt5/include/QtCore/QRandomGenerator64
qt5/include/QtCore/QReadLocker
qt5/include/QtCore/QReadWriteLock
qt5/include/QtCore/QRect
@@ -473,6 +501,7 @@ qt5/include/QtCore/QScopedPointerObjectDeleteLater
qt5/include/QtCore/QScopedPointerPodDeleter
qt5/include/QtCore/QScopedValueRollback
qt5/include/QtCore/QSemaphore
+qt5/include/QtCore/QSemaphoreReleaser
qt5/include/QtCore/QSequentialAnimationGroup
qt5/include/QtCore/QSequentialIterable
qt5/include/QtCore/QSet
@@ -489,6 +518,7 @@ qt5/include/QtCore/QSize
qt5/include/QtCore/QSizeF
qt5/include/QtCore/QSocketNotifier
qt5/include/QtCore/QSortFilterProxyModel
+qt5/include/QtCore/QSpecialInteger
qt5/include/QtCore/QStack
qt5/include/QtCore/QStandardPaths
qt5/include/QtCore/QState
@@ -496,18 +526,22 @@ qt5/include/QtCore/QStateMachine
qt5/include/QtCore/QStaticArrayData
qt5/include/QtCore/QStaticAssertFailure
qt5/include/QtCore/QStaticByteArrayData
+qt5/include/QtCore/QStaticByteArrayMatcherBase
qt5/include/QtCore/QStaticPlugin
qt5/include/QtCore/QStaticStringData
qt5/include/QtCore/QStorageInfo
qt5/include/QtCore/QString
+qt5/include/QtCore/QStringAlgorithms
qt5/include/QtCore/QStringBuilder
qt5/include/QtCore/QStringData
qt5/include/QtCore/QStringDataPtr
qt5/include/QtCore/QStringList
qt5/include/QtCore/QStringListIterator
qt5/include/QtCore/QStringListModel
+qt5/include/QtCore/QStringLiteral
qt5/include/QtCore/QStringMatcher
qt5/include/QtCore/QStringRef
+qt5/include/QtCore/QStringView
qt5/include/QtCore/QSysInfo
qt5/include/QtCore/QSystemSemaphore
qt5/include/QtCore/QTemporaryDir
@@ -531,6 +565,7 @@ qt5/include/QtCore/QTimerEvent
qt5/include/QtCore/QTranslator
qt5/include/QtCore/QTypeInfo
qt5/include/QtCore/QTypeInfoMerger
+qt5/include/QtCore/QTypeInfoQuery
qt5/include/QtCore/QUnhandledException
qt5/include/QtCore/QUrl
qt5/include/QtCore/QUrlQuery
@@ -545,6 +580,7 @@ qt5/include/QtCore/QVariantList
qt5/include/QtCore/QVariantMap
qt5/include/QtCore/QVector
qt5/include/QtCore/QVectorIterator
+qt5/include/QtCore/QVersionNumber
qt5/include/QtCore/QWaitCondition
qt5/include/QtCore/QWeakPointer
qt5/include/QtCore/QWinEventNotifier
@@ -562,6 +598,8 @@ qt5/include/QtCore/QXmlStreamReader
qt5/include/QtCore/QXmlStreamStringRef
qt5/include/QtCore/QXmlStreamWriter
qt5/include/QtCore/Q_PID
+qt5/include/QtCore/Q_SECURITY_ATTRIBUTES
+qt5/include/QtCore/Q_STARTUPINFO
qt5/include/QtCore/Qt
qt5/include/QtCore/QtAlgorithms
qt5/include/QtCore/QtCleanUpFunction
@@ -593,17 +631,9 @@ qt5/include/QtCore/qarraydata.h
qt5/include/QtCore/qarraydataops.h
qt5/include/QtCore/qarraydatapointer.h
qt5/include/QtCore/qatomic.h
-qt5/include/QtCore/qatomic_armv5.h
-qt5/include/QtCore/qatomic_armv6.h
-qt5/include/QtCore/qatomic_armv7.h
qt5/include/QtCore/qatomic_bootstrap.h
qt5/include/QtCore/qatomic_cxx11.h
-qt5/include/QtCore/qatomic_gcc.h
-qt5/include/QtCore/qatomic_ia64.h
-qt5/include/QtCore/qatomic_mips.h
qt5/include/QtCore/qatomic_msvc.h
-qt5/include/QtCore/qatomic_unix.h
-qt5/include/QtCore/qatomic_x86.h
qt5/include/QtCore/qbasicatomic.h
qt5/include/QtCore/qbasictimer.h
qt5/include/QtCore/qbitarray.h
@@ -617,12 +647,7 @@ qt5/include/QtCore/qcollator.h
qt5/include/QtCore/qcommandlineoption.h
qt5/include/QtCore/qcommandlineparser.h
qt5/include/QtCore/qcompilerdetection.h
-qt5/include/QtCore/qconfig-dist.h
-qt5/include/QtCore/qconfig-large.h
-qt5/include/QtCore/qconfig-medium.h
-qt5/include/QtCore/qconfig-minimal.h
-qt5/include/QtCore/qconfig-nacl.h
-qt5/include/QtCore/qconfig-small.h
+qt5/include/QtCore/qconfig-bootstrapped.h
qt5/include/QtCore/qconfig.h
qt5/include/QtCore/qcontainerfwd.h
qt5/include/QtCore/qcontiguouscache.h
@@ -631,6 +656,7 @@ qt5/include/QtCore/qcoreevent.h
qt5/include/QtCore/qcryptographichash.h
qt5/include/QtCore/qdatastream.h
qt5/include/QtCore/qdatetime.h
+qt5/include/QtCore/qdeadlinetimer.h
qt5/include/QtCore/qdebug.h
qt5/include/QtCore/qdir.h
qt5/include/QtCore/qdiriterator.h
@@ -641,7 +667,6 @@ qt5/include/QtCore/qeventloop.h
qt5/include/QtCore/qeventtransition.h
qt5/include/QtCore/qexception.h
qt5/include/QtCore/qfactoryinterface.h
-qt5/include/QtCore/qfeatures.h
qt5/include/QtCore/qfile.h
qt5/include/QtCore/qfiledevice.h
qt5/include/QtCore/qfileinfo.h
@@ -649,9 +674,9 @@ qt5/include/QtCore/qfileselector.h
qt5/include/QtCore/qfilesystemwatcher.h
qt5/include/QtCore/qfinalstate.h
qt5/include/QtCore/qflags.h
+qt5/include/QtCore/qfloat16.h
qt5/include/QtCore/qfunctions_nacl.h
qt5/include/QtCore/qfunctions_vxworks.h
-qt5/include/QtCore/qfunctions_wince.h
qt5/include/QtCore/qfunctions_winrt.h
qt5/include/QtCore/qfuture.h
qt5/include/QtCore/qfutureinterface.h
@@ -661,6 +686,7 @@ qt5/include/QtCore/qgenericatomic.h
qt5/include/QtCore/qglobal.h
qt5/include/QtCore/qglobalstatic.h
qt5/include/QtCore/qhash.h
+qt5/include/QtCore/qhashfunctions.h
qt5/include/QtCore/qhistorystate.h
qt5/include/QtCore/qidentityproxymodel.h
qt5/include/QtCore/qiodevice.h
@@ -677,7 +703,6 @@ qt5/include/QtCore/qline.h
qt5/include/QtCore/qlinkedlist.h
qt5/include/QtCore/qlist.h
qt5/include/QtCore/qlocale.h
-qt5/include/QtCore/qlocale_blackberry.h
qt5/include/QtCore/qlockfile.h
qt5/include/QtCore/qlogging.h
qt5/include/QtCore/qloggingcategory.h
@@ -698,6 +723,7 @@ qt5/include/QtCore/qobject_impl.h
qt5/include/QtCore/qobjectcleanuphandler.h
qt5/include/QtCore/qobjectdefs.h
qt5/include/QtCore/qobjectdefs_impl.h
+qt5/include/QtCore/qoperatingsystemversion.h
qt5/include/QtCore/qpair.h
qt5/include/QtCore/qparallelanimationgroup.h
qt5/include/QtCore/qpauseanimation.h
@@ -709,6 +735,7 @@ qt5/include/QtCore/qprocess.h
qt5/include/QtCore/qprocessordetection.h
qt5/include/QtCore/qpropertyanimation.h
qt5/include/QtCore/qqueue.h
+qt5/include/QtCore/qrandom.h
qt5/include/QtCore/qreadwritelock.h
qt5/include/QtCore/qrect.h
qt5/include/QtCore/qrefcount.h
@@ -739,14 +766,18 @@ qt5/include/QtCore/qstate.h
qt5/include/QtCore/qstatemachine.h
qt5/include/QtCore/qstorageinfo.h
qt5/include/QtCore/qstring.h
+qt5/include/QtCore/qstringalgorithms.h
qt5/include/QtCore/qstringbuilder.h
qt5/include/QtCore/qstringlist.h
qt5/include/QtCore/qstringlistmodel.h
+qt5/include/QtCore/qstringliteral.h
qt5/include/QtCore/qstringmatcher.h
+qt5/include/QtCore/qstringview.h
qt5/include/QtCore/qsysinfo.h
qt5/include/QtCore/qsystemdetection.h
qt5/include/QtCore/qsystemsemaphore.h
qt5/include/QtCore/qt_windows.h
+qt5/include/QtCore/qtcore-config.h
qt5/include/QtCore/qtcoreversion.h
qt5/include/QtCore/qtemporarydir.h
qt5/include/QtCore/qtemporaryfile.h
@@ -769,6 +800,8 @@ qt5/include/QtCore/qvariant.h
qt5/include/QtCore/qvariantanimation.h
qt5/include/QtCore/qvarlengtharray.h
qt5/include/QtCore/qvector.h
+qt5/include/QtCore/qversionnumber.h
+qt5/include/QtCore/qversiontagging.h
qt5/include/QtCore/qwaitcondition.h
qt5/include/QtCore/qwineventnotifier.h
qt5/include/QtCore/qxmlstream.h
@@ -790,6 +823,7 @@ qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbuspendingcall_p.h
qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusthreaddebug_p.h
qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusutil_p.h
qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusxmlparser_p.h
+qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qtdbusglobal_p.h
qt5/include/QtDBus/QDBusAbstractAdaptor
qt5/include/QtDBus/QDBusAbstractInterface
qt5/include/QtDBus/QDBusAbstractInterfaceBase
@@ -835,7 +869,84 @@ qt5/include/QtDBus/qdbusserver.h
qt5/include/QtDBus/qdbusservicewatcher.h
qt5/include/QtDBus/qdbusunixfiledescriptor.h
qt5/include/QtDBus/qdbusvirtualobject.h
+qt5/include/QtDBus/qtdbusglobal.h
qt5/include/QtDBus/qtdbusversion.h
+qt5/include/QtDeviceDiscoverySupport/${PKGVERSION}/QtDeviceDiscoverySupport/private/qdevicediscovery_dummy_p.h
+qt5/include/QtDeviceDiscoverySupport/${PKGVERSION}/QtDeviceDiscoverySupport/private/qdevicediscovery_p.h
+qt5/include/QtDeviceDiscoverySupport/${PKGVERSION}/QtDeviceDiscoverySupport/private/qdevicediscovery_static_p.h
+qt5/include/QtDeviceDiscoverySupport/${PKGVERSION}/QtDeviceDiscoverySupport/private/qdevicediscovery_udev_p.h
+qt5/include/QtDeviceDiscoverySupport/QtDeviceDiscoverySupport
+qt5/include/QtDeviceDiscoverySupport/QtDeviceDiscoverySupportDepends
+qt5/include/QtDeviceDiscoverySupport/QtDeviceDiscoverySupportVersion
+qt5/include/QtDeviceDiscoverySupport/qtdevicediscoverysupportversion.h
+qt5/include/QtEdidSupport/${PKGVERSION}/QtEdidSupport/private/qedidparser_p.h
+qt5/include/QtEdidSupport/${PKGVERSION}/QtEdidSupport/private/qedidvendortable_p.h
+qt5/include/QtEdidSupport/QtEdidSupport
+qt5/include/QtEdidSupport/QtEdidSupportDepends
+qt5/include/QtEdidSupport/QtEdidSupportVersion
+qt5/include/QtEdidSupport/qtedidsupportversion.h
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/${PKGVERSION}/QtEglFSDeviceIntegration/private/qeglfscontext_p.h
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/${PKGVERSION}/QtEglFSDeviceIntegration/private/qeglfscursor_p.h
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/${PKGVERSION}/QtEglFSDeviceIntegration/private/qeglfsdeviceintegration_p.h
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/${PKGVERSION}/QtEglFSDeviceIntegration/private/qeglfsglobal_p.h
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/${PKGVERSION}/QtEglFSDeviceIntegration/private/qeglfshooks_p.h
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/${PKGVERSION}/QtEglFSDeviceIntegration/private/qeglfsintegration_p.h
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/${PKGVERSION}/QtEglFSDeviceIntegration/private/qeglfsoffscreenwindow_p.h
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/${PKGVERSION}/QtEglFSDeviceIntegration/private/qeglfsscreen_p.h
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/${PKGVERSION}/QtEglFSDeviceIntegration/private/qeglfswindow_p.h
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/QtEglFSDeviceIntegration
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/QtEglFSDeviceIntegrationDepends
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/QtEglFSDeviceIntegrationVersion
+${PLIST.egl}qt5/include/QtEglFSDeviceIntegration/qteglfsdeviceintegrationversion.h
+${PLIST.egl}qt5/include/QtEglSupport/${PKGVERSION}/QtEglSupport/private/qeglconvenience_p.h
+${PLIST.egl}qt5/include/QtEglSupport/${PKGVERSION}/QtEglSupport/private/qeglpbuffer_p.h
+${PLIST.egl}qt5/include/QtEglSupport/${PKGVERSION}/QtEglSupport/private/qeglplatformcontext_p.h
+${PLIST.egl}qt5/include/QtEglSupport/${PKGVERSION}/QtEglSupport/private/qeglstreamconvenience_p.h
+${PLIST.egl}qt5/include/QtEglSupport/${PKGVERSION}/QtEglSupport/private/qt_egl_p.h
+${PLIST.egl}qt5/include/QtEglSupport/${PKGVERSION}/QtEglSupport/private/qxlibeglintegration_p.h
+${PLIST.egl}qt5/include/QtEglSupport/QtEglSupport
+${PLIST.egl}qt5/include/QtEglSupport/QtEglSupportDepends
+${PLIST.egl}qt5/include/QtEglSupport/QtEglSupportVersion
+${PLIST.egl}qt5/include/QtEglSupport/qteglsupportversion.h
+qt5/include/QtEventDispatcherSupport/${PKGVERSION}/QtEventDispatcherSupport/private/qeventdispatcher_glib_p.h
+qt5/include/QtEventDispatcherSupport/${PKGVERSION}/QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h
+qt5/include/QtEventDispatcherSupport/${PKGVERSION}/QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h
+qt5/include/QtEventDispatcherSupport/${PKGVERSION}/QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h
+qt5/include/QtEventDispatcherSupport/QtEventDispatcherSupport
+qt5/include/QtEventDispatcherSupport/QtEventDispatcherSupportDepends
+qt5/include/QtEventDispatcherSupport/QtEventDispatcherSupportVersion
+qt5/include/QtEventDispatcherSupport/qteventdispatchersupportversion.h
+qt5/include/QtFbSupport/${PKGVERSION}/QtFbSupport/private/qfbbackingstore_p.h
+qt5/include/QtFbSupport/${PKGVERSION}/QtFbSupport/private/qfbcursor_p.h
+qt5/include/QtFbSupport/${PKGVERSION}/QtFbSupport/private/qfbscreen_p.h
+qt5/include/QtFbSupport/${PKGVERSION}/QtFbSupport/private/qfbvthandler_p.h
+qt5/include/QtFbSupport/${PKGVERSION}/QtFbSupport/private/qfbwindow_p.h
+qt5/include/QtFbSupport/QtFbSupport
+qt5/include/QtFbSupport/QtFbSupportDepends
+qt5/include/QtFbSupport/QtFbSupportVersion
+qt5/include/QtFbSupport/qtfbsupportversion.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qfontconfigdatabase_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qfontengine_coretext_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qfontengine_ft_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qwindowsfontdatabase_ft_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qwindowsfontdatabase_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qwindowsfontengine_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qwindowsfontenginedirectwrite_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qwindowsnativeimage_p.h
+qt5/include/QtFontDatabaseSupport/${PKGVERSION}/QtFontDatabaseSupport/private/qwinrtfontdatabase_p.h
+qt5/include/QtFontDatabaseSupport/QtFontDatabaseSupport
+qt5/include/QtFontDatabaseSupport/QtFontDatabaseSupportDepends
+qt5/include/QtFontDatabaseSupport/QtFontDatabaseSupportVersion
+qt5/include/QtFontDatabaseSupport/qtfontdatabasesupportversion.h
+${PLIST.unix}qt5/include/QtGlxSupport/${PKGVERSION}/QtGlxSupport/private/qglxconvenience_p.h
+${PLIST.unix}qt5/include/QtGlxSupport/QtGlxSupport
+${PLIST.unix}qt5/include/QtGlxSupport/QtGlxSupportDepends
+${PLIST.unix}qt5/include/QtGlxSupport/QtGlxSupportVersion
+${PLIST.unix}qt5/include/QtGlxSupport/qtglxsupportversion.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qabstractlayoutstyleinfo_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qabstracttextdocumentlayout_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qaccessiblecache_p.h
@@ -844,6 +955,8 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/private/qblendfunctions_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qblittable_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qbmphandler_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qcolor_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qcolorprofile_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qcoregraphics_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qcosmeticstroker_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qcssparser_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qcssutil_p.h
@@ -860,32 +973,32 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/private/qemulationpaintengine_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qevent_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfixed_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfont_p.h
-qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfontengine_ft_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfontengine_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfontengine_qpf2_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfontengineglyphcache_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfontsubset_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qfragmentmap_p.h
-qt5/include/QtGui/${PKGVERSION}/QtGui/private/qgifhandler_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qglyphrun_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qgrayraster_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qgridlayoutengine_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qguiapplication_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qharfbuzzng_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qhexstring_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qhighdpiscaling_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qicon_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qiconloader_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qimage_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qimagepixmapcleanuphooks_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qimagescale_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qinputcontrol_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qinputdevicemanager_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qinputdevicemanager_p_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qinputmethod_p.h
-qt5/include/QtGui/${PKGVERSION}/QtGui/private/qjpeghandler_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qkeymapper_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qkeysequence_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qlayoutpolicy_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qmath_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qmemrotate_p.h
-qt5/include/QtGui/${PKGVERSION}/QtGui/private/qnativeimage_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengl2pexvertexarray_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengl_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglcontext_p.h
@@ -897,11 +1010,10 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglframebufferobject_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglgradientcache_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglpaintdevice_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglpaintengine_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglprogrambinarycache_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglqueryhelper_p.h
-qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglshadercache_meego_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglshadercache_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengltexture_p.h
-qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengltextureblitter_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengltexturecache_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengltextureglyphcache_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopengltexturehelper_p.h
@@ -932,8 +1044,17 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/private/qrasterdefs_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qrasterizer_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qrawfont_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qrbtree_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qrgba64_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qscreen_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qsessionmanager_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qshaderformat_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qshadergenerator_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qshadergraph_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qshadergraphloader_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qshaderlanguage_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qshadernode_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qshadernodeport_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qshadernodesloader_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qshapedpixmapdndwindow_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qshortcutmap_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qsimpledrag_p.h
@@ -954,10 +1075,13 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/private/qtextobject_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qtextodfwriter_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qtexttable_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qtextureglyphcache_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qtgui-config_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qtguiglobal_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qtouchdevice_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qtriangulatingstroker_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qtriangulator_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qvectorpath_p.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/private/qvulkanwindow_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qwindow_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qxbmhandler_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/private/qxpmhandler_p.h
@@ -995,12 +1119,11 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformtheme.h
qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformtheme_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformthemefactory_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformthemeplugin.h
+qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformvulkaninstance.h
qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformwindow.h
qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformwindow_p.h
qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qwindowsysteminterface.h
qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qwindowsysteminterface_p.h
-qt5/include/QtGui/${PKGVERSION}/QtGui/private/qinputdevicemanager_p.h
-qt5/include/QtGui/${PKGVERSION}/QtGui/private/qinputdevicemanager_p_p.h
qt5/include/QtGui/QAbstractTextDocumentLayout
qt5/include/QtGui/QAbstractUndoItem
qt5/include/QtGui/QAccessible
@@ -1085,6 +1208,7 @@ qt5/include/QtGui/QIntValidator
qt5/include/QtGui/QKeyEvent
qt5/include/QtGui/QKeySequence
qt5/include/QtGui/QLinearGradient
+qt5/include/QtGui/QList
qt5/include/QtGui/QMatrix
qt5/include/QtGui/QMatrix2x2
qt5/include/QtGui/QMatrix2x3
@@ -1105,6 +1229,8 @@ qt5/include/QtGui/QOpenGLContext
qt5/include/QtGui/QOpenGLContextGroup
qt5/include/QtGui/QOpenGLDebugLogger
qt5/include/QtGui/QOpenGLDebugMessage
+qt5/include/QtGui/QOpenGLExtraFunctions
+qt5/include/QtGui/QOpenGLExtraFunctionsPrivate
qt5/include/QtGui/QOpenGLFramebufferObject
qt5/include/QtGui/QOpenGLFramebufferObjectFormat
qt5/include/QtGui/QOpenGLFunctions
@@ -1141,6 +1267,7 @@ qt5/include/QtGui/QOpenGLPixelTransferOptions
qt5/include/QtGui/QOpenGLShader
qt5/include/QtGui/QOpenGLShaderProgram
qt5/include/QtGui/QOpenGLTexture
+qt5/include/QtGui/QOpenGLTextureBlitter
qt5/include/QtGui/QOpenGLTimeMonitor
qt5/include/QtGui/QOpenGLTimerQuery
qt5/include/QtGui/QOpenGLVersionFunctions
@@ -1168,6 +1295,7 @@ qt5/include/QtGui/QPixelFormat
qt5/include/QtGui/QPixmap
qt5/include/QtGui/QPixmapCache
qt5/include/QtGui/QPlatformSurfaceEvent
+qt5/include/QtGui/QPointingDeviceUniqueId
qt5/include/QtGui/QPolygon
qt5/include/QtGui/QPolygonF
qt5/include/QtGui/QQuaternion
@@ -1179,6 +1307,7 @@ qt5/include/QtGui/QRegion
qt5/include/QtGui/QRegularExpressionValidator
qt5/include/QtGui/QResizeEvent
qt5/include/QtGui/QRgb
+qt5/include/QtGui/QRgba64
qt5/include/QtGui/QScreen
qt5/include/QtGui/QScreenOrientationChangeEvent
qt5/include/QtGui/QScrollEvent
@@ -1232,6 +1361,14 @@ qt5/include/QtGui/QValidator
qt5/include/QtGui/QVector2D
qt5/include/QtGui/QVector3D
qt5/include/QtGui/QVector4D
+qt5/include/QtGui/QVulkanDeviceFunctions
+qt5/include/QtGui/QVulkanExtension
+qt5/include/QtGui/QVulkanFunctions
+qt5/include/QtGui/QVulkanInfoVector
+qt5/include/QtGui/QVulkanInstance
+qt5/include/QtGui/QVulkanLayer
+qt5/include/QtGui/QVulkanWindow
+qt5/include/QtGui/QVulkanWindowRenderer
qt5/include/QtGui/QWhatsThisClickedEvent
qt5/include/QtGui/QWheelEvent
qt5/include/QtGui/QWidgetList
@@ -1286,6 +1423,7 @@ qt5/include/QtGui/qopenglcontext.h
qt5/include/QtGui/qopengldebug.h
qt5/include/QtGui/qopengles2ext.h
qt5/include/QtGui/qopenglext.h
+qt5/include/QtGui/qopenglextrafunctions.h
qt5/include/QtGui/qopenglframebufferobject.h
qt5/include/QtGui/qopenglfunctions.h
qt5/include/QtGui/qopenglfunctions_1_0.h
@@ -1319,6 +1457,7 @@ qt5/include/QtGui/qopenglpaintdevice.h
qt5/include/QtGui/qopenglpixeltransferoptions.h
qt5/include/QtGui/qopenglshaderprogram.h
qt5/include/QtGui/qopengltexture.h
+qt5/include/QtGui/qopengltextureblitter.h
qt5/include/QtGui/qopengltimerquery.h
qt5/include/QtGui/qopenglversionfunctions.h
qt5/include/QtGui/qopenglvertexarrayobject.h
@@ -1345,6 +1484,7 @@ qt5/include/QtGui/qrasterwindow.h
qt5/include/QtGui/qrawfont.h
qt5/include/QtGui/qregion.h
qt5/include/QtGui/qrgb.h
+qt5/include/QtGui/qrgba64.h
qt5/include/QtGui/qscreen.h
qt5/include/QtGui/qsessionmanager.h
qt5/include/QtGui/qstandarditemmodel.h
@@ -1363,6 +1503,8 @@ qt5/include/QtGui/qtextlist.h
qt5/include/QtGui/qtextobject.h
qt5/include/QtGui/qtextoption.h
qt5/include/QtGui/qtexttable.h
+qt5/include/QtGui/qtgui-config.h
+qt5/include/QtGui/qtguiglobal.h
qt5/include/QtGui/qtguiversion.h
qt5/include/QtGui/qtouchdevice.h
qt5/include/QtGui/qtransform.h
@@ -1370,9 +1512,24 @@ qt5/include/QtGui/qvalidator.h
qt5/include/QtGui/qvector2d.h
qt5/include/QtGui/qvector3d.h
qt5/include/QtGui/qvector4d.h
+qt5/include/QtGui/qvulkanfunctions.h
+qt5/include/QtGui/qvulkaninstance.h
+qt5/include/QtGui/qvulkanwindow.h
qt5/include/QtGui/qwindow.h
qt5/include/QtGui/qwindowdefs.h
qt5/include/QtGui/qwindowdefs_win.h
+${PLIST.unix}qt5/include/QtKmsSupport/${PKGVERSION}/QtKmsSupport/private/qkmsdevice_p.h
+${PLIST.unix}qt5/include/QtKmsSupport/QtKmsSupport
+${PLIST.unix}qt5/include/QtKmsSupport/QtKmsSupportDepends
+${PLIST.unix}qt5/include/QtKmsSupport/QtKmsSupportVersion
+${PLIST.unix}qt5/include/QtKmsSupport/qtkmssupportversion.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/bitstreams_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/hpack_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/hpacktable_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/http2frames_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/http2protocol_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/http2streams_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/huffman_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qabstractnetworkcache_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qabstractprotocolhandler_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qabstractsocket_p.h
@@ -1385,6 +1542,9 @@ qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qdnslookup_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qftp_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhostaddress_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhostinfo_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhsts_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhstsstore_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhttp2protocolhandler_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhttpmultipart_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhttpnetworkconnection_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qhttpnetworkconnectionchannel_p.h
@@ -1411,18 +1571,19 @@ qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkconfigmanager_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkconfiguration_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkcookie_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkcookiejar_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkdatagram_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkdiskcache_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkfile_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkinterface_p.h
-qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkinterface_win_p.h
-qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkproxy_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkreply_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkreplydataimpl_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkreplyfileimpl_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkreplyhttpimpl_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkreplyimpl_p.h
-qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkreplynsurlconnectionimpl_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworkrequest_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworksession_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsctpserver_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsctpsocket_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsharednetworksession_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsocks5socketengine_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qspdyprotocolhandler_p.h
@@ -1432,16 +1593,21 @@ qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslcertificateextension_p
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslcipher_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslconfiguration_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslcontext_openssl_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qssldiffiehellmanparameters_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslkey_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslpresharedkeyauthenticator_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_mac_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_openssl11_symbols_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_openssl_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_openssl_symbols_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_opensslpre11_symbols_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_winrt_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtcpserver_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtcpsocket_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtnetwork-config_p.h
+qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtnetworkglobal_p.h
qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qurlinfo_p.h
-qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslpresharedkeyauthenticator_p.h
-qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_mac_p.h
-qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtcpserver_p.h
qt5/include/QtNetwork/QAbstractNetworkCache
qt5/include/QtNetwork/QAbstractSocket
qt5/include/QtNetwork/QAuthenticator
@@ -1453,6 +1619,7 @@ qt5/include/QtNetwork/QDnsServiceRecord
qt5/include/QtNetwork/QDnsTextRecord
qt5/include/QtNetwork/QHostAddress
qt5/include/QtNetwork/QHostInfo
+qt5/include/QtNetwork/QHstsPolicy
qt5/include/QtNetwork/QHttpMultiPart
qt5/include/QtNetwork/QHttpPart
qt5/include/QtNetwork/QIPv6Address
@@ -1465,6 +1632,7 @@ qt5/include/QtNetwork/QNetworkConfiguration
qt5/include/QtNetwork/QNetworkConfigurationManager
qt5/include/QtNetwork/QNetworkCookie
qt5/include/QtNetwork/QNetworkCookieJar
+qt5/include/QtNetwork/QNetworkDatagram
qt5/include/QtNetwork/QNetworkDiskCache
qt5/include/QtNetwork/QNetworkInterface
qt5/include/QtNetwork/QNetworkProxy
@@ -1473,11 +1641,14 @@ qt5/include/QtNetwork/QNetworkProxyQuery
qt5/include/QtNetwork/QNetworkReply
qt5/include/QtNetwork/QNetworkRequest
qt5/include/QtNetwork/QNetworkSession
+qt5/include/QtNetwork/QSctpServer
+qt5/include/QtNetwork/QSctpSocket
qt5/include/QtNetwork/QSsl
qt5/include/QtNetwork/QSslCertificate
qt5/include/QtNetwork/QSslCertificateExtension
qt5/include/QtNetwork/QSslCipher
qt5/include/QtNetwork/QSslConfiguration
+qt5/include/QtNetwork/QSslDiffieHellmanParameters
qt5/include/QtNetwork/QSslEllipticCurve
qt5/include/QtNetwork/QSslError
qt5/include/QtNetwork/QSslKey
@@ -1496,6 +1667,7 @@ qt5/include/QtNetwork/qauthenticator.h
qt5/include/QtNetwork/qdnslookup.h
qt5/include/QtNetwork/qhostaddress.h
qt5/include/QtNetwork/qhostinfo.h
+qt5/include/QtNetwork/qhstspolicy.h
qt5/include/QtNetwork/qhttpmultipart.h
qt5/include/QtNetwork/qlocalserver.h
qt5/include/QtNetwork/qlocalsocket.h
@@ -1504,18 +1676,21 @@ qt5/include/QtNetwork/qnetworkconfigmanager.h
qt5/include/QtNetwork/qnetworkconfiguration.h
qt5/include/QtNetwork/qnetworkcookie.h
qt5/include/QtNetwork/qnetworkcookiejar.h
+qt5/include/QtNetwork/qnetworkdatagram.h
qt5/include/QtNetwork/qnetworkdiskcache.h
-qt5/include/QtNetwork/qnetworkfunctions_wince.h
qt5/include/QtNetwork/qnetworkinterface.h
qt5/include/QtNetwork/qnetworkproxy.h
qt5/include/QtNetwork/qnetworkreply.h
qt5/include/QtNetwork/qnetworkrequest.h
qt5/include/QtNetwork/qnetworksession.h
+qt5/include/QtNetwork/qsctpserver.h
+qt5/include/QtNetwork/qsctpsocket.h
qt5/include/QtNetwork/qssl.h
qt5/include/QtNetwork/qsslcertificate.h
qt5/include/QtNetwork/qsslcertificateextension.h
qt5/include/QtNetwork/qsslcipher.h
qt5/include/QtNetwork/qsslconfiguration.h
+qt5/include/QtNetwork/qssldiffiehellmanparameters.h
qt5/include/QtNetwork/qsslellipticcurve.h
qt5/include/QtNetwork/qsslerror.h
qt5/include/QtNetwork/qsslkey.h
@@ -1523,6 +1698,8 @@ qt5/include/QtNetwork/qsslpresharedkeyauthenticator.h
qt5/include/QtNetwork/qsslsocket.h
qt5/include/QtNetwork/qtcpserver.h
qt5/include/QtNetwork/qtcpsocket.h
+qt5/include/QtNetwork/qtnetwork-config.h
+qt5/include/QtNetwork/qtnetworkglobal.h
qt5/include/QtNetwork/qtnetworkversion.h
qt5/include/QtNetwork/qudpsocket.h
qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qgl2pexvertexarray_p.h
@@ -1534,7 +1711,6 @@ qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qglframebufferobject_p.h
qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qglgradientcache_p.h
qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qglpaintdevice_p.h
qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qglpixelbuffer_p.h
-qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qglshadercache_meego_p.h
qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qglshadercache_p.h
qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qgraphicsshadereffect_p.h
qt5/include/QtOpenGL/${PKGVERSION}/QtOpenGL/private/qpaintengineex_opengl2_p.h
@@ -1570,95 +1746,40 @@ qt5/include/QtOpenGLExtensions/QtOpenGLExtensionsDepends
qt5/include/QtOpenGLExtensions/QtOpenGLExtensionsVersion
qt5/include/QtOpenGLExtensions/qopenglextensions.h
qt5/include/QtOpenGLExtensions/qtopenglextensionsversion.h
+qt5/include/QtPlatformCompositorSupport/${PKGVERSION}/QtPlatformCompositorSupport/private/qopenglcompositor_p.h
+qt5/include/QtPlatformCompositorSupport/${PKGVERSION}/QtPlatformCompositorSupport/private/qopenglcompositorbackingstore_p.h
+qt5/include/QtPlatformCompositorSupport/QtPlatformCompositorSupport
+qt5/include/QtPlatformCompositorSupport/QtPlatformCompositorSupportDepends
+qt5/include/QtPlatformCompositorSupport/QtPlatformCompositorSupportVersion
+qt5/include/QtPlatformCompositorSupport/qtplatformcompositorsupportversion.h
qt5/include/QtPlatformHeaders/QCocoaNativeContext
+qt5/include/QtPlatformHeaders/QCocoaWindowFunctions
qt5/include/QtPlatformHeaders/QEGLNativeContext
qt5/include/QtPlatformHeaders/QEglFSFunctions
qt5/include/QtPlatformHeaders/QGLXNativeContext
+qt5/include/QtPlatformHeaders/QPlatformHeaderHelper
qt5/include/QtPlatformHeaders/QWGLNativeContext
+qt5/include/QtPlatformHeaders/QWaylandWindowFunctions
qt5/include/QtPlatformHeaders/QWindowsWindowFunctions
+qt5/include/QtPlatformHeaders/QXcbIntegrationFunctions
+qt5/include/QtPlatformHeaders/QXcbScreenFunctions
qt5/include/QtPlatformHeaders/QXcbWindowFunctions
qt5/include/QtPlatformHeaders/QtPlatformHeaders
qt5/include/QtPlatformHeaders/QtPlatformHeadersDepends
qt5/include/QtPlatformHeaders/QtPlatformHeadersVersion
qt5/include/QtPlatformHeaders/qcocoanativecontext.h
+qt5/include/QtPlatformHeaders/qcocoawindowfunctions.h
qt5/include/QtPlatformHeaders/qeglfsfunctions.h
qt5/include/QtPlatformHeaders/qeglnativecontext.h
qt5/include/QtPlatformHeaders/qglxnativecontext.h
+qt5/include/QtPlatformHeaders/qplatformheaderhelper.h
qt5/include/QtPlatformHeaders/qtplatformheadersversion.h
+qt5/include/QtPlatformHeaders/qwaylandwindowfunctions.h
qt5/include/QtPlatformHeaders/qwglnativecontext.h
qt5/include/QtPlatformHeaders/qwindowswindowfunctions.h
+qt5/include/QtPlatformHeaders/qxcbintegrationfunctions.h
+qt5/include/QtPlatformHeaders/qxcbscreenfunctions.h
qt5/include/QtPlatformHeaders/qxcbwindowfunctions.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/application_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/atspiadaptor_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/bridge_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/cache_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/cglconvenience_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/constant_mappings_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/dbusconnection_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qaccessiblebridgeutils_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qbasicfontdatabase_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qcfsocketnotifier_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qcoretextfontdatabase_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdevicediscovery_dummy_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdevicediscovery_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdevicediscovery_static_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdevicediscovery_udev_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglconvenience_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglpbuffer_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformcontext_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformcursor_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformintegration_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformscreen_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformwindow_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevkeyboard_defaultmap_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevkeyboardhandler_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevkeyboardmanager_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevmousehandler_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevmousemanager_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevtablet_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeventdispatcher_cf_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeventdispatcher_glib_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfbbackingstore_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfbcursor_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfbscreen_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfbvthandler_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfbwindow_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfontconfigdatabase_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfontengine_coretext_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfontenginemultifontconfig_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qgenericunixeventdispatcher_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qgenericunixfontdatabase_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qgenericunixservices_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qgenericunixthemes_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qglxconvenience_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qmacmime_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qxlibeglintegration_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/struct_marshallers_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbusmenuadaptor_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbusmenuconnection_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbusmenutypes_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbusplatformmenu_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbustrayicon_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbustraytypes_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevtouchhandler_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevtouchmanager_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qlibinputhandler_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qlibinputkeyboard_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qlibinputpointer_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qlibinputtouch_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qopenglcompositor_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qopenglcompositorbackingstore_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qstatusnotifieritemadaptor_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qtslib_p.h
-qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qxdgnotificationproxy_p.h
-qt5/include/QtPlatformSupport/QtPlatformSupport
-qt5/include/QtPlatformSupport/QtPlatformSupportDepends
-qt5/include/QtPlatformSupport/QtPlatformSupportVersion
-qt5/include/QtPlatformSupport/qtplatformsupportversion.h
-qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintdevice.h
-qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintersupport.h
-qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintplugin.h
qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qabstractprintdialog_p.h
qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qcups_p.h
qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qcupsjobwidget_p.h
@@ -1672,6 +1793,11 @@ qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprintengine_pdf
qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprintengine_win_p.h
qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprinter_p.h
qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprinterinfo_p.h
+qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qtprintsupport-config_p.h
+qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qtprintsupportglobal_p.h
+qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintdevice.h
+qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintersupport.h
+qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintplugin.h
qt5/include/QtPrintSupport/QAbstractPrintDialog
qt5/include/QtPrintSupport/QPageSetupDialog
qt5/include/QtPrintSupport/QPrintDialog
@@ -1691,23 +1817,21 @@ qt5/include/QtPrintSupport/qprinter.h
qt5/include/QtPrintSupport/qprinterinfo.h
qt5/include/QtPrintSupport/qprintpreviewdialog.h
qt5/include/QtPrintSupport/qprintpreviewwidget.h
+qt5/include/QtPrintSupport/qtprintsupport-config.h
qt5/include/QtPrintSupport/qtprintsupportglobal.h
qt5/include/QtPrintSupport/qtprintsupportversion.h
-qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsql_db2_p.h
-qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsql_ibase_p.h
-qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsql_mysql_p.h
-qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsql_oci_p.h
-qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsql_odbc_p.h
-qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsql_psql_p.h
-qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsql_sqlite2_p.h
-qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsql_sqlite_p.h
-qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsql_tds_p.h
+${PLIST.unix}qt5/include/QtServiceSupport/${PKGVERSION}/QtServiceSupport/private/qgenericunixservices_p.h
+${PLIST.unix}qt5/include/QtServiceSupport/QtServiceSupport
+${PLIST.unix}qt5/include/QtServiceSupport/QtServiceSupportDepends
+${PLIST.unix}qt5/include/QtServiceSupport/QtServiceSupportVersion
+${PLIST.unix}qt5/include/QtServiceSupport/qtservicesupportversion.h
qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsqlcachedresult_p.h
qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsqldriver_p.h
qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsqlnulldriver_p.h
qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsqlquerymodel_p.h
qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsqlresult_p.h
qt5/include/QtSql/${PKGVERSION}/QtSql/private/qsqltablemodel_p.h
+qt5/include/QtSql/${PKGVERSION}/QtSql/private/qtsqlglobal_p.h
qt5/include/QtSql/QSql
qt5/include/QtSql/QSqlDatabase
qt5/include/QtSql/QSqlDriver
@@ -1742,6 +1866,7 @@ qt5/include/QtSql/qsqlrelationaldelegate.h
qt5/include/QtSql/qsqlrelationaltablemodel.h
qt5/include/QtSql/qsqlresult.h
qt5/include/QtSql/qsqltablemodel.h
+qt5/include/QtSql/qtsqlglobal.h
qt5/include/QtSql/qtsqlversion.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/callgrind_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/cycle_p.h
@@ -1752,18 +1877,22 @@ qt5/include/QtTest/${PKGVERSION}/QtTest/private/qbenchmarkevent_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qbenchmarkmeasurement_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qbenchmarkmetric_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qbenchmarkperfevents_p.h
+qt5/include/QtTest/${PKGVERSION}/QtTest/private/qbenchmarktimemeasurers_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qbenchmarkvalgrind_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qcsvbenchmarklogger_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qplaintestlogger_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qsignaldumper_p.h
+qt5/include/QtTest/${PKGVERSION}/QtTest/private/qteamcitylogger_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestblacklist_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestcoreelement_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestcorelist_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestelement_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestelementattribute_p.h
+qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtesthelpers_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestlog_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestresult_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtesttable_p.h
+qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestutil_macos_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestxunitstreamer_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qxctestlogger_p.h
qt5/include/QtTest/${PKGVERSION}/QtTest/private/qxmltestlogger_p.h
@@ -1785,6 +1914,7 @@ qt5/include/QtTest/QTestMouseEvent
qt5/include/QtTest/QtTest
qt5/include/QtTest/QtTestDepends
qt5/include/QtTest/QtTestGui
+qt5/include/QtTest/QtTestNetwork
qt5/include/QtTest/QtTestVersion
qt5/include/QtTest/QtTestWidgets
qt5/include/QtTest/qbenchmark.h
@@ -1793,6 +1923,7 @@ qt5/include/QtTest/qsignalspy.h
qt5/include/QtTest/qtest.h
qt5/include/QtTest/qtest_global.h
qt5/include/QtTest/qtest_gui.h
+qt5/include/QtTest/qtest_network.h
qt5/include/QtTest/qtest_widgets.h
qt5/include/QtTest/qtestaccessible.h
qt5/include/QtTest/qtestassert.h
@@ -1806,20 +1937,39 @@ qt5/include/QtTest/qtestspontaneevent.h
qt5/include/QtTest/qtestsystem.h
qt5/include/QtTest/qtesttouch.h
qt5/include/QtTest/qttestversion.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qabstractfileiconengine_p.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qdbusmenuadaptor_p.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qdbusmenubar_p.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qdbusmenuconnection_p.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qdbusmenuregistrarproxy_p.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qdbusmenutypes_p.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qdbusplatformmenu_p.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qdbustrayicon_p.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qdbustraytypes_p.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qgenericunixthemes_p.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qstatusnotifieritemadaptor_p.h
+qt5/include/QtThemeSupport/${PKGVERSION}/QtThemeSupport/private/qxdgnotificationproxy_p.h
+qt5/include/QtThemeSupport/QtThemeSupport
+qt5/include/QtThemeSupport/QtThemeSupportDepends
+qt5/include/QtThemeSupport/QtThemeSupportVersion
+qt5/include/QtThemeSupport/qtthemesupportversion.h
+qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/complexwidgets_p.h
+qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/itemviews_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractbutton_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractitemdelegate_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractitemview_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractscrollarea_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractslider_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractspinbox_p.h
+qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qaccessiblemenu_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qaccessiblewidgetfactory_p.h
+qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qaccessiblewidgets_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qaction_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qandroidstyle_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qapplication_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qbasickeyeventtransition_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qbasicmouseeventtransition_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qbsptree_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcolordialog_p.h
+qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qbuttongroup_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcolumnview_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcolumnviewgrip_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcombobox_p.h
@@ -1861,11 +2011,6 @@ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicsscenelinearindex_
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicstransform_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicsview_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgraphicswidget_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgtk2painter_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgtkglobal_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgtkpainter_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgtkstyle_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qgtkstyle_p_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qheaderview_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qitemeditorfactory_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qkeysequenceedit_p.h
@@ -1876,15 +2021,14 @@ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qlineedit_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qlistview_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qlistwidget_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qmacgesturerecognizer_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qmacstyle_mac_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qmacstyle_mac_p_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qmainwindowlayout_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qmdiarea_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qmdisubwindow_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qmenu_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qmenu_wince_resource_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qmenubar_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qpixmapfilter_p.h
+qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qpixmapstyle_p.h
+qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qpixmapstyle_p_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qplaintextedit_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qproxystyle_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qpushbutton_p.h
@@ -1914,6 +2058,8 @@ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qtoolbarseparator_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qtreeview_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qtreewidget_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qtreewidgetitemiterator_p.h
+qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qtwidgets-config_p.h
+qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qtwidgetsglobal_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qundostack_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwidget_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwidgetaction_p.h
@@ -1926,23 +2072,11 @@ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwidgettextcontrol_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwidgettextcontrol_p_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwidgetwindow_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowcontainer_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowscestyle_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowscestyle_p_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowsmobilestyle_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowsmobilestyle_p_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowsstyle_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowsstyle_p_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowsvistastyle_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowsvistastyle_p_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowsxpstyle_p.h
-qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowsxpstyle_p_p.h
qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwizard_win_p.h
-qt5/include/QtWidgets/5.5.1/QtWidgets/private/complexwidgets_p.h
-qt5/include/QtWidgets/5.5.1/QtWidgets/private/itemviews_p.h
-qt5/include/QtWidgets/5.5.1/QtWidgets/private/qaccessiblemenu_p.h
-qt5/include/QtWidgets/5.5.1/QtWidgets/private/qaccessiblewidgets_p.h
-qt5/include/QtWidgets/5.5.1/QtWidgets/private/rangecontrols_p.h
-qt5/include/QtWidgets/5.5.1/QtWidgets/private/simplewidgets_p.h
+qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/rangecontrols_p.h
+qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/simplewidgets_p.h
qt5/include/QtWidgets/QAbstractButton
qt5/include/QtWidgets/QAbstractGraphicsShapeItem
qt5/include/QtWidgets/QAbstractItemDelegate
@@ -2285,6 +2419,8 @@ qt5/include/QtWidgets/qtooltip.h
qt5/include/QtWidgets/qtreeview.h
qt5/include/QtWidgets/qtreewidget.h
qt5/include/QtWidgets/qtreewidgetitemiterator.h
+qt5/include/QtWidgets/qtwidgets-config.h
+qt5/include/QtWidgets/qtwidgetsglobal.h
qt5/include/QtWidgets/qtwidgetsversion.h
qt5/include/QtWidgets/qundogroup.h
qt5/include/QtWidgets/qundostack.h
@@ -2292,8 +2428,8 @@ qt5/include/QtWidgets/qundoview.h
qt5/include/QtWidgets/qwhatsthis.h
qt5/include/QtWidgets/qwidget.h
qt5/include/QtWidgets/qwidgetaction.h
-qt5/include/QtWidgets/qwidgetsfunctions_wince.h
qt5/include/QtWidgets/qwizard.h
+qt5/include/QtXml/${PKGVERSION}/QtXml/private/qtxml-config_p.h
qt5/include/QtXml/${PKGVERSION}/QtXml/private/qxml_p.h
qt5/include/QtXml/QDomAttr
qt5/include/QtXml/QDomCDATASection
@@ -2330,11 +2466,13 @@ qt5/include/QtXml/QtXml
qt5/include/QtXml/QtXmlDepends
qt5/include/QtXml/QtXmlVersion
qt5/include/QtXml/qdom.h
+qt5/include/QtXml/qtxml-config.h
qt5/include/QtXml/qtxmlglobal.h
qt5/include/QtXml/qtxmlversion.h
qt5/include/QtXml/qxml.h
qt5/lib/cmake/Qt5/Qt5Config.cmake
qt5/lib/cmake/Qt5/Qt5ConfigVersion.cmake
+qt5/lib/cmake/Qt5/Qt5ModuleLocation.cmake
qt5/lib/cmake/Qt5Concurrent/Qt5ConcurrentConfig.cmake
qt5/lib/cmake/Qt5Concurrent/Qt5ConcurrentConfigVersion.cmake
qt5/lib/cmake/Qt5Core/Qt5CTestMacros.cmake
@@ -2350,25 +2488,27 @@ qt5/lib/cmake/Qt5DBus/Qt5DBusMacros.cmake
qt5/lib/cmake/Qt5Gui/Qt5GuiConfig.cmake
qt5/lib/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
qt5/lib/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake
-${PLIST.mac}qt5/lib/cmake/Qt5Gui/Qt5Gui_QCocoaIntegrationPlugin.cmake
${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
+${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSEmulatorIntegrationPlugin.cmake
${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
+${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSKmsEglDeviceIntegrationPlugin.cmake
+${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSKmsGbmIntegrationPlugin.cmake
${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSX11IntegrationPlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake
-${PLIST.gtk2}qt5/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake
+${PLIST.gtk3}qt5/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake
${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QTuioTouchPlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
+${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QVncIntegrationPlugin.cmake
${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
+${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
+${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
qt5/lib/cmake/Qt5Network/Qt5NetworkConfig.cmake
qt5/lib/cmake/Qt5Network/Qt5NetworkConfigVersion.cmake
-${PLIST.mac}qt5/lib/cmake/Qt5Network/Qt5Network_QCoreWlanEnginePlugin.cmake
qt5/lib/cmake/Qt5Network/Qt5Network_QGenericEnginePlugin.cmake
qt5/lib/cmake/Qt5OpenGL/Qt5OpenGLConfig.cmake
qt5/lib/cmake/Qt5OpenGL/Qt5OpenGLConfigVersion.cmake
@@ -2376,11 +2516,12 @@ qt5/lib/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake
qt5/lib/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake
qt5/lib/cmake/Qt5PrintSupport/Qt5PrintSupportConfig.cmake
qt5/lib/cmake/Qt5PrintSupport/Qt5PrintSupportConfigVersion.cmake
-${PLIST.mac}qt5/lib/cmake/Qt5PrintSupport/Qt5PrintSupport_QCocoaPrinterSupportPlugin.cmake
${PLIST.cups}qt5/lib/cmake/Qt5PrintSupport/Qt5PrintSupport_QCupsPrinterSupportPlugin.cmake
qt5/lib/cmake/Qt5Sql/Qt5SqlConfig.cmake
qt5/lib/cmake/Qt5Sql/Qt5SqlConfigVersion.cmake
+qt5/lib/cmake/Qt5Sql/Qt5Sql_QSQLiteDriverPlugin.cmake
qt5/lib/cmake/Qt5Test/Qt5TestConfig.cmake
+qt5/lib/cmake/Qt5Test/Qt5TestConfigExtras.cmake
qt5/lib/cmake/Qt5Test/Qt5TestConfigVersion.cmake
qt5/lib/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake
qt5/lib/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake
@@ -2388,71 +2529,134 @@ qt5/lib/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake
qt5/lib/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
qt5/lib/cmake/Qt5Xml/Qt5XmlConfig.cmake
qt5/lib/cmake/Qt5Xml/Qt5XmlConfigVersion.cmake
-qt5/lib/libQt5Bootstrap.la
+qt5/lib/libQt5AccessibilitySupport.a
+qt5/lib/libQt5AccessibilitySupport.prl
+qt5/lib/libQt5Bootstrap.a
qt5/lib/libQt5Bootstrap.prl
-qt5/lib/libQt5Concurrent.la
qt5/lib/libQt5Concurrent.prl
-qt5/lib/libQt5Core.la
+qt5/lib/libQt5Concurrent.so
+qt5/lib/libQt5Concurrent.so.${PKGVERSION}
+qt5/lib/libQt5Concurrent.so.5
+qt5/lib/libQt5Concurrent.so.5.10
qt5/lib/libQt5Core.prl
-qt5/lib/libQt5DBus.la
+qt5/lib/libQt5Core.so
+qt5/lib/libQt5Core.so.${PKGVERSION}
+qt5/lib/libQt5Core.so.5
+qt5/lib/libQt5Core.so.5.10
qt5/lib/libQt5DBus.prl
-${PLIST.egl}qt5/lib/libQt5EglDeviceIntegration.la
-${PLIST.egl}qt5/lib/libQt5EglDeviceIntegration.prl
-qt5/lib/libQt5Gui.la
+qt5/lib/libQt5DBus.so
+qt5/lib/libQt5DBus.so.${PKGVERSION}
+qt5/lib/libQt5DBus.so.5
+qt5/lib/libQt5DBus.so.5.10
+qt5/lib/libQt5DeviceDiscoverySupport.a
+qt5/lib/libQt5DeviceDiscoverySupport.prl
+qt5/lib/libQt5EdidSupport.a
+qt5/lib/libQt5EdidSupport.prl
+${PLIST.egl}qt5/lib/libQt5EglFSDeviceIntegration.prl
+${PLIST.egl}qt5/lib/libQt5EglFSDeviceIntegration.so
+${PLIST.egl}qt5/lib/libQt5EglFSDeviceIntegration.so.${PKGVERSION}
+${PLIST.egl}qt5/lib/libQt5EglFSDeviceIntegration.so.5
+${PLIST.egl}qt5/lib/libQt5EglFSDeviceIntegration.so.5.10
+${PLIST.egl}qt5/lib/libQt5EglFsKmsSupport.prl
+${PLIST.egl}qt5/lib/libQt5EglFsKmsSupport.so
+${PLIST.egl}qt5/lib/libQt5EglFsKmsSupport.so.${PKGVERSION}
+${PLIST.egl}qt5/lib/libQt5EglFsKmsSupport.so.5
+${PLIST.egl}qt5/lib/libQt5EglFsKmsSupport.so.5.10
+${PLIST.egl}qt5/lib/libQt5EglSupport.a
+${PLIST.egl}qt5/lib/libQt5EglSupport.prl
+qt5/lib/libQt5EventDispatcherSupport.a
+qt5/lib/libQt5EventDispatcherSupport.prl
+qt5/lib/libQt5FbSupport.a
+qt5/lib/libQt5FbSupport.prl
+qt5/lib/libQt5FontDatabaseSupport.a
+qt5/lib/libQt5FontDatabaseSupport.prl
+${PLIST.unix}qt5/lib/libQt5GlxSupport.a
+${PLIST.unix}qt5/lib/libQt5GlxSupport.prl
qt5/lib/libQt5Gui.prl
-qt5/lib/libQt5Network.la
+qt5/lib/libQt5Gui.so
+qt5/lib/libQt5Gui.so.${PKGVERSION}
+qt5/lib/libQt5Gui.so.5
+qt5/lib/libQt5Gui.so.5.10
+${PLIST.unix}qt5/lib/libQt5KmsSupport.a
+${PLIST.unix}qt5/lib/libQt5KmsSupport.prl
qt5/lib/libQt5Network.prl
-qt5/lib/libQt5OpenGL.la
+qt5/lib/libQt5Network.so
+qt5/lib/libQt5Network.so.${PKGVERSION}
+qt5/lib/libQt5Network.so.5
+qt5/lib/libQt5Network.so.5.10
qt5/lib/libQt5OpenGL.prl
-qt5/lib/libQt5OpenGLExtensions.la
+qt5/lib/libQt5OpenGL.so
+qt5/lib/libQt5OpenGL.so.${PKGVERSION}
+qt5/lib/libQt5OpenGL.so.5
+qt5/lib/libQt5OpenGL.so.5.10
qt5/lib/libQt5OpenGLExtensions.prl
-qt5/lib/libQt5PlatformSupport.la
-qt5/lib/libQt5PlatformSupport.prl
-qt5/lib/libQt5PrintSupport.la
+qt5/lib/libQt5OpenGLExtensions.so
+qt5/lib/libQt5OpenGLExtensions.so.${PKGVERSION}
+qt5/lib/libQt5OpenGLExtensions.so.5
+qt5/lib/libQt5OpenGLExtensions.so.5.10
+qt5/lib/libQt5PlatformCompositorSupport.a
+qt5/lib/libQt5PlatformCompositorSupport.prl
qt5/lib/libQt5PrintSupport.prl
-qt5/lib/libQt5Sql.la
+qt5/lib/libQt5PrintSupport.so
+qt5/lib/libQt5PrintSupport.so.${PKGVERSION}
+qt5/lib/libQt5PrintSupport.so.5
+qt5/lib/libQt5PrintSupport.so.5.10
+${PLIST.unix}qt5/lib/libQt5ServiceSupport.a
+${PLIST.unix}qt5/lib/libQt5ServiceSupport.prl
qt5/lib/libQt5Sql.prl
-qt5/lib/libQt5Test.la
+qt5/lib/libQt5Sql.so
+qt5/lib/libQt5Sql.so.${PKGVERSION}
+qt5/lib/libQt5Sql.so.5
+qt5/lib/libQt5Sql.so.5.10
qt5/lib/libQt5Test.prl
-qt5/lib/libQt5Widgets.la
+qt5/lib/libQt5Test.so
+qt5/lib/libQt5Test.so.${PKGVERSION}
+qt5/lib/libQt5Test.so.5
+qt5/lib/libQt5Test.so.5.10
+qt5/lib/libQt5ThemeSupport.a
+qt5/lib/libQt5ThemeSupport.prl
qt5/lib/libQt5Widgets.prl
-${PLIST.unix}qt5/lib/libQt5XcbQpa.la
+qt5/lib/libQt5Widgets.so
+qt5/lib/libQt5Widgets.so.${PKGVERSION}
+qt5/lib/libQt5Widgets.so.5
+qt5/lib/libQt5Widgets.so.5.10
${PLIST.unix}qt5/lib/libQt5XcbQpa.prl
-qt5/lib/libQt5Xml.la
+${PLIST.unix}qt5/lib/libQt5XcbQpa.so
+${PLIST.unix}qt5/lib/libQt5XcbQpa.so.${PKGVERSION}
+${PLIST.unix}qt5/lib/libQt5XcbQpa.so.5
+${PLIST.unix}qt5/lib/libQt5XcbQpa.so.5.10
qt5/lib/libQt5Xml.prl
-qt5/lib/pkgconfig/Qt5Bootstrap.pc
+qt5/lib/libQt5Xml.so
+qt5/lib/libQt5Xml.so.${PKGVERSION}
+qt5/lib/libQt5Xml.so.5
+qt5/lib/libQt5Xml.so.5.10
qt5/lib/pkgconfig/Qt5Concurrent.pc
qt5/lib/pkgconfig/Qt5Core.pc
qt5/lib/pkgconfig/Qt5DBus.pc
-${PLIST.egl}qt5/lib/pkgconfig/Qt5EglDeviceIntegration.pc
qt5/lib/pkgconfig/Qt5Gui.pc
qt5/lib/pkgconfig/Qt5Network.pc
qt5/lib/pkgconfig/Qt5OpenGL.pc
qt5/lib/pkgconfig/Qt5OpenGLExtensions.pc
-qt5/lib/pkgconfig/Qt5PlatformSupport.pc
qt5/lib/pkgconfig/Qt5PrintSupport.pc
qt5/lib/pkgconfig/Qt5Sql.pc
qt5/lib/pkgconfig/Qt5Test.pc
qt5/lib/pkgconfig/Qt5Widgets.pc
-${PLIST.unix}qt5/lib/pkgconfig/Qt5XcbQpa.pc
qt5/lib/pkgconfig/Qt5Xml.pc
qt5/mkspecs/aix-g++-64/qmake.conf
qt5/mkspecs/aix-g++-64/qplatformdefs.h
qt5/mkspecs/aix-g++/qmake.conf
qt5/mkspecs/aix-g++/qplatformdefs.h
-qt5/mkspecs/aix-xlc-64/qmake.conf
-qt5/mkspecs/aix-xlc-64/qplatformdefs.h
-qt5/mkspecs/aix-xlc/qmake.conf
-qt5/mkspecs/aix-xlc/qplatformdefs.h
+qt5/mkspecs/android-clang/qmake.conf
+qt5/mkspecs/android-clang/qplatformdefs.h
qt5/mkspecs/android-g++/qmake.conf
qt5/mkspecs/android-g++/qplatformdefs.h
-qt5/mkspecs/blackberry-armle-v7-qcc/qmake.conf
-qt5/mkspecs/blackberry-armle-v7-qcc/qplatformdefs.h
-qt5/mkspecs/blackberry-x86-qcc/qmake.conf
-qt5/mkspecs/blackberry-x86-qcc/qplatformdefs.h
qt5/mkspecs/common/aix/qplatformdefs.h
+qt5/mkspecs/common/android-base-head.conf
+qt5/mkspecs/common/android-base-tail.conf
qt5/mkspecs/common/android/qplatformdefs.h
-qt5/mkspecs/common/armcc.conf
+qt5/mkspecs/common/angle.conf
+qt5/mkspecs/common/bsd/bsd.conf
+qt5/mkspecs/common/bsd/qplatformdefs.h
qt5/mkspecs/common/c89/qplatformdefs.h
qt5/mkspecs/common/clang-mac.conf
qt5/mkspecs/common/clang.conf
@@ -2463,23 +2667,27 @@ qt5/mkspecs/common/g++.conf
qt5/mkspecs/common/gcc-base-mac.conf
qt5/mkspecs/common/gcc-base-unix.conf
qt5/mkspecs/common/gcc-base.conf
+qt5/mkspecs/common/ghs-base.conf
+qt5/mkspecs/common/ghs-integrity-armv7.conf
+qt5/mkspecs/common/ghs-integrity-armv8.conf
+qt5/mkspecs/common/ghs-integrity-x86.conf
+qt5/mkspecs/common/integrity/qplatformdefs.h
qt5/mkspecs/common/ios.conf
-qt5/mkspecs/common/ios/GLES2/gl2.h
-qt5/mkspecs/common/ios/clang.conf
-qt5/mkspecs/common/ios/qmake.conf
-qt5/mkspecs/common/linux-android.conf
qt5/mkspecs/common/linux.conf
qt5/mkspecs/common/llvm.conf
qt5/mkspecs/common/mac.conf
qt5/mkspecs/common/mac/qplatformdefs.h
qt5/mkspecs/common/macx.conf
qt5/mkspecs/common/msvc-desktop.conf
+qt5/mkspecs/common/msvc-version.conf
qt5/mkspecs/common/nacl/g++-nacl32.conf
qt5/mkspecs/common/nacl/g++-nacl64.conf
qt5/mkspecs/common/nacl/nacl-base.conf
qt5/mkspecs/common/nacl/qplatformdefs.h
qt5/mkspecs/common/posix/qplatformdefs.h
+qt5/mkspecs/common/qcc-base-qnx-aarch64le.conf
qt5/mkspecs/common/qcc-base-qnx-armle-v7.conf
+qt5/mkspecs/common/qcc-base-qnx-x86-64.conf
qt5/mkspecs/common/qcc-base-qnx-x86.conf
qt5/mkspecs/common/qcc-base-qnx.conf
qt5/mkspecs/common/qcc-base.conf
@@ -2488,9 +2696,15 @@ qt5/mkspecs/common/qnx/qplatformdefs.h
qt5/mkspecs/common/sanitize.conf
qt5/mkspecs/common/shell-unix.conf
qt5/mkspecs/common/shell-win32.conf
+qt5/mkspecs/common/solaris.conf
+qt5/mkspecs/common/tvos.conf
+qt5/mkspecs/common/uikit.conf
+qt5/mkspecs/common/uikit/GLES2/gl2.h
+qt5/mkspecs/common/uikit/clang.conf
+qt5/mkspecs/common/uikit/qmake.conf
qt5/mkspecs/common/unix.conf
-qt5/mkspecs/common/wince/qmake.conf
-qt5/mkspecs/common/wince/qplatformdefs.h
+qt5/mkspecs/common/watchos.conf
+qt5/mkspecs/common/windows-vulkan.conf
qt5/mkspecs/common/winrt_winphone/assets/logo_150x150.png
qt5/mkspecs/common/winrt_winphone/assets/logo_30x30.png
qt5/mkspecs/common/winrt_winphone/assets/logo_310x150.png
@@ -2502,41 +2716,75 @@ qt5/mkspecs/common/winrt_winphone/assets/logo_70x70.png
qt5/mkspecs/common/winrt_winphone/assets/logo_71x71.png
qt5/mkspecs/common/winrt_winphone/assets/logo_store.png
qt5/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
-qt5/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
-qt5/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in
qt5/mkspecs/common/winrt_winphone/qmake.conf
qt5/mkspecs/common/winrt_winphone/qplatformdefs.h
qt5/mkspecs/cygwin-g++/qmake.conf
qt5/mkspecs/cygwin-g++/qplatformdefs.h
qt5/mkspecs/darwin-g++/qmake.conf
qt5/mkspecs/darwin-g++/qplatformdefs.h
+qt5/mkspecs/devices/common/freebsd_device_post.conf
+qt5/mkspecs/devices/common/freebsd_device_pre.conf
qt5/mkspecs/devices/common/linux_arm_device_post.conf
qt5/mkspecs/devices/common/linux_device_post.conf
qt5/mkspecs/devices/common/linux_device_pre.conf
+qt5/mkspecs/devices/freebsd-generic-clang/qmake.conf
+qt5/mkspecs/devices/freebsd-generic-clang/qplatformdefs.h
+qt5/mkspecs/devices/freebsd-rasp-pi-clang/qmake.conf
+qt5/mkspecs/devices/freebsd-rasp-pi-clang/qplatformdefs.h
+qt5/mkspecs/devices/integrity-armv8-drive-cx/qmake.conf
+qt5/mkspecs/devices/integrity-armv8-drive-cx/qplatformdefs.h
qt5/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
qt5/mkspecs/devices/linux-archos-gen8-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp
qt5/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
qt5/mkspecs/devices/linux-arm-amlogic-8726M-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-arm-generic-g++/qmake.conf
+qt5/mkspecs/devices/linux-arm-generic-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf
qt5/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
qt5/mkspecs/devices/linux-arm-trident-pnx8473-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-beagleboard-g++/qmake.conf
qt5/mkspecs/devices/linux-beagleboard-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-colibri-vf-g++/qmake.conf
+qt5/mkspecs/devices/linux-colibri-vf-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-drive-cx-g++/qmake.conf
+qt5/mkspecs/devices/linux-drive-cx-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-emu-g++/qmake.conf
+qt5/mkspecs/devices/linux-emu-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-generic-g++/qmake.conf
+qt5/mkspecs/devices/linux-generic-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-imx53qsb-g++/qmake.conf
qt5/mkspecs/devices/linux-imx53qsb-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-imx6-g++/qmake.conf
qt5/mkspecs/devices/linux-imx6-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-imx7-g++/qmake.conf
+qt5/mkspecs/devices/linux-imx7-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-jetson-tk1-g++/qmake.conf
+qt5/mkspecs/devices/linux-jetson-tk1-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-jetson-tk1-pro-g++/qmake.conf
+qt5/mkspecs/devices/linux-jetson-tk1-pro-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-jetson-tx1-g++/qmake.conf
+qt5/mkspecs/devices/linux-jetson-tx1-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp
qt5/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
qt5/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-mipsel-ci20-g++/qmake.conf
+qt5/mkspecs/devices/linux-mipsel-ci20-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-nuc-g++/qmake.conf
+qt5/mkspecs/devices/linux-nuc-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-odroid-xu3-g++/qmake.conf
qt5/mkspecs/devices/linux-odroid-xu3-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
qt5/mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-rasp-pi2-g++/qmake.conf
qt5/mkspecs/devices/linux-rasp-pi2-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf
+qt5/mkspecs/devices/linux-rasp-pi3-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-rasp-pi3-vc4-g++/qmake.conf
+qt5/mkspecs/devices/linux-rasp-pi3-vc4-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-rcar-h2-g++/qmake.conf
+qt5/mkspecs/devices/linux-rcar-h2-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
qt5/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
@@ -2545,14 +2793,19 @@ qt5/mkspecs/devices/linux-snowball-g++/qmake.conf
qt5/mkspecs/devices/linux-snowball-g++/qplatformdefs.h
qt5/mkspecs/devices/linux-tegra2-g++/qmake.conf
qt5/mkspecs/devices/linux-tegra2-g++/qplatformdefs.h
+qt5/mkspecs/devices/linux-tinkerboard-g++/qmake.conf
+qt5/mkspecs/devices/linux-tinkerboard-g++/qplatformdefs.h
qt5/mkspecs/devices/qmake.conf
+qt5/mkspecs/dummy/qmake.conf
qt5/mkspecs/features/android/android.prf
qt5/mkspecs/features/android/android_deployment_settings.prf
+qt5/mkspecs/features/android/resolve_target.prf
+qt5/mkspecs/features/android/sdk.prf
+qt5/mkspecs/features/benchmark.prf
qt5/mkspecs/features/build_pass.prf
-qt5/mkspecs/features/c++11.prf
-qt5/mkspecs/features/c++14.prf
qt5/mkspecs/features/cmake_functions.prf
qt5/mkspecs/features/configure.prf
+qt5/mkspecs/features/configure_base.prf
qt5/mkspecs/features/create_cmake.prf
qt5/mkspecs/features/ctest_testcase.prf
qt5/mkspecs/features/ctest_testcase_common.prf
@@ -2562,7 +2815,11 @@ qt5/mkspecs/features/data/cmake/ExtraSourceIncludes.cmake.in
qt5/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
qt5/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in
qt5/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+qt5/mkspecs/features/data/configure.json
qt5/mkspecs/features/data/dummy.cpp
+qt5/mkspecs/features/data/mac/objc_namespace.sh
+qt5/mkspecs/features/data/macros.cpp
+qt5/mkspecs/features/data/unix/findclasslist.pl
qt5/mkspecs/features/dbusadaptors.prf
qt5/mkspecs/features/dbuscommon.pri
qt5/mkspecs/features/dbusinterfaces.prf
@@ -2576,6 +2833,7 @@ qt5/mkspecs/features/exceptions.prf
qt5/mkspecs/features/exceptions_off.prf
qt5/mkspecs/features/exclusive_builds.prf
qt5/mkspecs/features/exclusive_builds_post.prf
+qt5/mkspecs/features/file_copies.prf
qt5/mkspecs/features/gcov.prf
qt5/mkspecs/features/include_source_dir.prf
qt5/mkspecs/features/incredibuild_xge.prf
@@ -2584,31 +2842,37 @@ qt5/mkspecs/features/lex.prf
qt5/mkspecs/features/link_ltcg.prf
qt5/mkspecs/features/link_pkgconfig.prf
qt5/mkspecs/features/ltcg.prf
-qt5/mkspecs/features/mac/default_post.prf
+qt5/mkspecs/features/mac/asset_catalogs.prf
+qt5/mkspecs/features/mac/mac.prf
qt5/mkspecs/features/mac/objective_c.prf
qt5/mkspecs/features/mac/rez.prf
qt5/mkspecs/features/mac/sdk.prf
+qt5/mkspecs/features/mac/toolchain.prf
+qt5/mkspecs/features/mac/unsupported/objc_namespace.prf
qt5/mkspecs/features/moc.prf
qt5/mkspecs/features/no_debug_info.prf
+qt5/mkspecs/features/plugin_bundle.prf
qt5/mkspecs/features/precompile_header.prf
-qt5/mkspecs/features/qfeatures.prf
+qt5/mkspecs/features/qgltf.prf
qt5/mkspecs/features/qlalr.prf
qt5/mkspecs/features/qmake.conf
+qt5/mkspecs/features/qmake_use.prf
qt5/mkspecs/features/qml1_module.prf
qt5/mkspecs/features/qml1_plugin.prf
qt5/mkspecs/features/qml_debug.prf
qt5/mkspecs/features/qml_module.prf
qt5/mkspecs/features/qml_plugin.prf
qt5/mkspecs/features/qmltestcase.prf
-qt5/mkspecs/features/qpa/basicunixfontdatabase.prf
-qt5/mkspecs/features/qpa/genericunixfontdatabase.prf
qt5/mkspecs/features/qt.prf
qt5/mkspecs/features/qt_android_deps.prf
qt5/mkspecs/features/qt_app.prf
qt5/mkspecs/features/qt_build_config.prf
+qt5/mkspecs/features/qt_build_extra.prf
qt5/mkspecs/features/qt_build_paths.prf
+qt5/mkspecs/features/qt_clear_installs.prf
qt5/mkspecs/features/qt_common.prf
qt5/mkspecs/features/qt_config.prf
+qt5/mkspecs/features/qt_configure.prf
qt5/mkspecs/features/qt_docs.prf
qt5/mkspecs/features/qt_docs_targets.prf
qt5/mkspecs/features/qt_example_installs.prf
@@ -2635,13 +2899,28 @@ qt5/mkspecs/features/testcase.prf
qt5/mkspecs/features/testcase_targets.prf
qt5/mkspecs/features/testcocoon.prf
qt5/mkspecs/features/testlib_defines.prf
+qt5/mkspecs/features/toolchain.prf
qt5/mkspecs/features/uic.prf
+qt5/mkspecs/features/uikit/bitcode.prf
+qt5/mkspecs/features/uikit/default_post.prf
+qt5/mkspecs/features/uikit/default_pre.prf
+qt5/mkspecs/features/uikit/device_destinations.sh
+qt5/mkspecs/features/uikit/devices.py
+qt5/mkspecs/features/uikit/exclusive_builds_post.prf
+qt5/mkspecs/features/uikit/qt.prf
+qt5/mkspecs/features/uikit/qt_parts.prf
+qt5/mkspecs/features/uikit/resolve_config.prf
+qt5/mkspecs/features/uikit/sdk.prf
+qt5/mkspecs/features/uikit/testcase.prf
+qt5/mkspecs/features/uikit/testcase_targets.prf
+qt5/mkspecs/features/uikit/watchos_coretext.prf
+qt5/mkspecs/features/uikit/xcodebuild.mk
+qt5/mkspecs/features/uikit/xcodebuild.prf
qt5/mkspecs/features/unix/bsymbolic_functions.prf
-qt5/mkspecs/features/unix/dylib.prf
+qt5/mkspecs/features/unix/ccache.prf
qt5/mkspecs/features/unix/hide_symbols.prf
qt5/mkspecs/features/unix/largefile.prf
qt5/mkspecs/features/unix/opengl.prf
-qt5/mkspecs/features/unix/openvg.prf
qt5/mkspecs/features/unix/separate_debug_info.prf
qt5/mkspecs/features/unix/thread.prf
qt5/mkspecs/features/unix/x11.prf
@@ -2659,63 +2938,43 @@ qt5/mkspecs/features/win32/dumpcpp.prf
qt5/mkspecs/features/win32/idcidl.prf
qt5/mkspecs/features/win32/msvc_mp.prf
qt5/mkspecs/features/win32/opengl.prf
-qt5/mkspecs/features/win32/openvg.prf
-qt5/mkspecs/features/win32/qt_config.prf
qt5/mkspecs/features/win32/qt_dll.prf
qt5/mkspecs/features/win32/rtti.prf
qt5/mkspecs/features/win32/rtti_off.prf
+qt5/mkspecs/features/win32/separate_debug_info.prf
qt5/mkspecs/features/win32/stl.prf
qt5/mkspecs/features/win32/stl_off.prf
qt5/mkspecs/features/win32/windeployqt.prf
qt5/mkspecs/features/win32/windows.prf
qt5/mkspecs/features/winrt/console.prf
qt5/mkspecs/features/winrt/default_pre.prf
-qt5/mkspecs/features/winrt/font_deployment.prf
qt5/mkspecs/features/winrt/package_manifest.prf
qt5/mkspecs/features/xctest.prf
qt5/mkspecs/features/yacc.prf
+qt5/mkspecs/freebsd-clang/qmake.conf
+qt5/mkspecs/freebsd-clang/qplatformdefs.h
qt5/mkspecs/freebsd-g++/qmake.conf
qt5/mkspecs/freebsd-g++/qplatformdefs.h
-qt5/mkspecs/freebsd-g++46/qmake.conf
-qt5/mkspecs/freebsd-g++46/qplatformdefs.h
-qt5/mkspecs/freebsd-icc/qmake.conf
-qt5/mkspecs/freebsd-icc/qplatformdefs.h
qt5/mkspecs/haiku-g++/qmake.conf
qt5/mkspecs/haiku-g++/qplatformdefs.h
-qt5/mkspecs/hpux-acc-64/qmake.conf
-qt5/mkspecs/hpux-acc-64/qplatformdefs.h
-qt5/mkspecs/hpux-acc-o64/qmake.conf
-qt5/mkspecs/hpux-acc-o64/qplatformdefs.h
-qt5/mkspecs/hpux-acc/qmake.conf
-qt5/mkspecs/hpux-acc/qplatformdefs.h
-qt5/mkspecs/hpux-g++-64/qmake.conf
-qt5/mkspecs/hpux-g++-64/qplatformdefs.h
-qt5/mkspecs/hpux-g++/qmake.conf
-qt5/mkspecs/hpux-g++/qplatformdefs.h
-qt5/mkspecs/hpuxi-acc-32/qmake.conf
-qt5/mkspecs/hpuxi-acc-32/qplatformdefs.h
-qt5/mkspecs/hpuxi-acc-64/qmake.conf
-qt5/mkspecs/hpuxi-acc-64/qplatformdefs.h
qt5/mkspecs/hpuxi-g++-64/qmake.conf
qt5/mkspecs/hpuxi-g++-64/qplatformdefs.h
qt5/mkspecs/hurd-g++/qmake.conf
qt5/mkspecs/hurd-g++/qplatformdefs.h
-qt5/mkspecs/irix-cc-64/qmake.conf
-qt5/mkspecs/irix-cc-64/qplatformdefs.h
-qt5/mkspecs/irix-cc/qmake.conf
-qt5/mkspecs/irix-cc/qplatformdefs.h
-qt5/mkspecs/irix-g++-64/qmake.conf
-qt5/mkspecs/irix-g++-64/qplatformdefs.h
-qt5/mkspecs/irix-g++/qmake.conf
-qt5/mkspecs/irix-g++/qplatformdefs.h
+qt5/mkspecs/integrity-armv7-imx6/qmake.conf
+qt5/mkspecs/integrity-armv7-imx6/qplatformdefs.h
+qt5/mkspecs/integrity-armv7/qmake.conf
+qt5/mkspecs/integrity-armv7/qplatformdefs.h
+qt5/mkspecs/integrity-x86/qmake.conf
+qt5/mkspecs/integrity-x86/qplatformdefs.h
+qt5/mkspecs/linux-aarch64-gnu-g++/qmake.conf
+qt5/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h
qt5/mkspecs/linux-arm-gnueabi-g++/qmake.conf
qt5/mkspecs/linux-arm-gnueabi-g++/qplatformdefs.h
qt5/mkspecs/linux-clang-libc++/qmake.conf
qt5/mkspecs/linux-clang-libc++/qplatformdefs.h
qt5/mkspecs/linux-clang/qmake.conf
qt5/mkspecs/linux-clang/qplatformdefs.h
-qt5/mkspecs/linux-cxx/qmake.conf
-qt5/mkspecs/linux-cxx/qplatformdefs.h
qt5/mkspecs/linux-g++-32/qmake.conf
qt5/mkspecs/linux-g++-32/qplatformdefs.h
qt5/mkspecs/linux-g++-64/qmake.conf
@@ -2726,68 +2985,53 @@ qt5/mkspecs/linux-icc-32/qmake.conf
qt5/mkspecs/linux-icc-32/qplatformdefs.h
qt5/mkspecs/linux-icc-64/qmake.conf
qt5/mkspecs/linux-icc-64/qplatformdefs.h
+qt5/mkspecs/linux-icc-k1om/qmake.conf
+qt5/mkspecs/linux-icc-k1om/qplatformdefs.h
qt5/mkspecs/linux-icc/qmake.conf
qt5/mkspecs/linux-icc/qplatformdefs.h
-qt5/mkspecs/linux-kcc/qmake.conf
-qt5/mkspecs/linux-kcc/qplatformdefs.h
qt5/mkspecs/linux-llvm/qmake.conf
qt5/mkspecs/linux-llvm/qplatformdefs.h
qt5/mkspecs/linux-lsb-g++/qmake.conf
qt5/mkspecs/linux-lsb-g++/qplatformdefs.h
-qt5/mkspecs/linux-pgcc/qmake.conf
-qt5/mkspecs/linux-pgcc/qplatformdefs.h
qt5/mkspecs/lynxos-g++/qmake.conf
qt5/mkspecs/lynxos-g++/qplatformdefs.h
-qt5/mkspecs/macx-clang-32/Info.plist.app
-qt5/mkspecs/macx-clang-32/Info.plist.lib
-qt5/mkspecs/macx-clang-32/qmake.conf
-qt5/mkspecs/macx-clang-32/qplatformdefs.h
qt5/mkspecs/macx-clang/Info.plist.app
+qt5/mkspecs/macx-clang/Info.plist.dSYM.in
qt5/mkspecs/macx-clang/Info.plist.lib
qt5/mkspecs/macx-clang/qmake.conf
qt5/mkspecs/macx-clang/qplatformdefs.h
-qt5/mkspecs/macx-g++-32/Info.plist.app
-qt5/mkspecs/macx-g++-32/Info.plist.lib
-qt5/mkspecs/macx-g++-32/qmake.conf
-qt5/mkspecs/macx-g++-32/qplatformdefs.h
qt5/mkspecs/macx-g++/Info.plist.app
+qt5/mkspecs/macx-g++/Info.plist.dSYM.in
qt5/mkspecs/macx-g++/Info.plist.lib
qt5/mkspecs/macx-g++/qmake.conf
qt5/mkspecs/macx-g++/qplatformdefs.h
-qt5/mkspecs/macx-g++40/Info.plist.app
-qt5/mkspecs/macx-g++40/Info.plist.lib
-qt5/mkspecs/macx-g++40/qmake.conf
-qt5/mkspecs/macx-g++40/qplatformdefs.h
-qt5/mkspecs/macx-g++42/Info.plist.app
-qt5/mkspecs/macx-g++42/Info.plist.lib
-qt5/mkspecs/macx-g++42/qmake.conf
-qt5/mkspecs/macx-g++42/qplatformdefs.h
qt5/mkspecs/macx-icc/Info.plist.app
+qt5/mkspecs/macx-icc/Info.plist.dSYM.in
qt5/mkspecs/macx-icc/Info.plist.lib
qt5/mkspecs/macx-icc/qmake.conf
qt5/mkspecs/macx-icc/qplatformdefs.h
qt5/mkspecs/macx-ios-clang/Default-568h@2x.png
qt5/mkspecs/macx-ios-clang/Info.plist.app
+qt5/mkspecs/macx-ios-clang/Info.plist.dSYM.in
qt5/mkspecs/macx-ios-clang/Info.plist.lib
qt5/mkspecs/macx-ios-clang/LaunchScreen.xib
qt5/mkspecs/macx-ios-clang/features/default_post.prf
-qt5/mkspecs/macx-ios-clang/features/default_pre.prf
-qt5/mkspecs/macx-ios-clang/features/qt.prf
-qt5/mkspecs/macx-ios-clang/features/qt_config.prf
-qt5/mkspecs/macx-ios-clang/features/qt_parts.prf
-qt5/mkspecs/macx-ios-clang/features/sdk.prf
qt5/mkspecs/macx-ios-clang/qmake.conf
qt5/mkspecs/macx-ios-clang/qplatformdefs.h
-qt5/mkspecs/macx-ios-clang/rename_main.sh
-qt5/mkspecs/macx-llvm/Info.plist.app
-qt5/mkspecs/macx-llvm/Info.plist.lib
-qt5/mkspecs/macx-llvm/qmake.conf
-qt5/mkspecs/macx-llvm/qplatformdefs.h
+qt5/mkspecs/macx-tvos-clang/Info.plist.app
+qt5/mkspecs/macx-tvos-clang/Info.plist.lib
+qt5/mkspecs/macx-tvos-clang/qmake.conf
+qt5/mkspecs/macx-tvos-clang/qplatformdefs.h
+qt5/mkspecs/macx-watchos-clang/Info.plist.app
+qt5/mkspecs/macx-watchos-clang/Info.plist.lib
+qt5/mkspecs/macx-watchos-clang/qmake.conf
+qt5/mkspecs/macx-watchos-clang/qplatformdefs.h
qt5/mkspecs/macx-xcode/QtTest.plist
qt5/mkspecs/macx-xcode/WorkspaceSettings.xcsettings
qt5/mkspecs/macx-xcode/default.xcscheme
qt5/mkspecs/macx-xcode/qmake.conf
qt5/mkspecs/macx-xcode/qplatformdefs.h
+qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri
qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
qt5/mkspecs/modules/qt_lib_concurrent.pri
qt5/mkspecs/modules/qt_lib_concurrent_private.pri
@@ -2795,22 +3039,33 @@ qt5/mkspecs/modules/qt_lib_core.pri
qt5/mkspecs/modules/qt_lib_core_private.pri
qt5/mkspecs/modules/qt_lib_dbus.pri
qt5/mkspecs/modules/qt_lib_dbus_private.pri
-${PLIST.egl}qt5/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri
+qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri
+qt5/mkspecs/modules/qt_lib_edid_support_private.pri
+${PLIST.egl}qt5/mkspecs/modules/qt_lib_egl_support_private.pri
+${PLIST.egl}qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri
+${PLIST.egl}qt5/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri
+qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri
+qt5/mkspecs/modules/qt_lib_fb_support_private.pri
+qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri
+${PLIST.unix}qt5/mkspecs/modules/qt_lib_glx_support_private.pri
qt5/mkspecs/modules/qt_lib_gui.pri
qt5/mkspecs/modules/qt_lib_gui_private.pri
+${PLIST.unix}qt5/mkspecs/modules/qt_lib_kms_support_private.pri
qt5/mkspecs/modules/qt_lib_network.pri
qt5/mkspecs/modules/qt_lib_network_private.pri
qt5/mkspecs/modules/qt_lib_opengl.pri
qt5/mkspecs/modules/qt_lib_opengl_private.pri
qt5/mkspecs/modules/qt_lib_openglextensions.pri
qt5/mkspecs/modules/qt_lib_openglextensions_private.pri
-qt5/mkspecs/modules/qt_lib_platformsupport_private.pri
+qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri
qt5/mkspecs/modules/qt_lib_printsupport.pri
qt5/mkspecs/modules/qt_lib_printsupport_private.pri
+${PLIST.unix}qt5/mkspecs/modules/qt_lib_service_support_private.pri
qt5/mkspecs/modules/qt_lib_sql.pri
qt5/mkspecs/modules/qt_lib_sql_private.pri
qt5/mkspecs/modules/qt_lib_testlib.pri
qt5/mkspecs/modules/qt_lib_testlib_private.pri
+qt5/mkspecs/modules/qt_lib_theme_support_private.pri
qt5/mkspecs/modules/qt_lib_widgets.pri
qt5/mkspecs/modules/qt_lib_widgets_private.pri
${PLIST.unix}qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri
@@ -2822,16 +3077,15 @@ qt5/mkspecs/openbsd-g++/qmake.conf
qt5/mkspecs/openbsd-g++/qplatformdefs.h
qt5/mkspecs/qconfig.pri
qt5/mkspecs/qdevice.pri
-qt5/mkspecs/qfeatures.pri
qt5/mkspecs/qmodule.pri
+qt5/mkspecs/qnx-aarch64le-qcc/qmake.conf
+qt5/mkspecs/qnx-aarch64le-qcc/qplatformdefs.h
qt5/mkspecs/qnx-armle-v7-qcc/qmake.conf
qt5/mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
+qt5/mkspecs/qnx-x86-64-qcc/qmake.conf
+qt5/mkspecs/qnx-x86-64-qcc/qplatformdefs.h
qt5/mkspecs/qnx-x86-qcc/qmake.conf
qt5/mkspecs/qnx-x86-qcc/qplatformdefs.h
-qt5/mkspecs/sco-cc/qmake.conf
-qt5/mkspecs/sco-cc/qplatformdefs.h
-qt5/mkspecs/sco-g++/qmake.conf
-qt5/mkspecs/sco-g++/qplatformdefs.h
qt5/mkspecs/solaris-cc-64-stlport/qmake.conf
qt5/mkspecs/solaris-cc-64-stlport/qplatformdefs.h
qt5/mkspecs/solaris-cc-64/qmake.conf
@@ -2844,21 +3098,6 @@ qt5/mkspecs/solaris-g++-64/qmake.conf
qt5/mkspecs/solaris-g++-64/qplatformdefs.h
qt5/mkspecs/solaris-g++/qmake.conf
qt5/mkspecs/solaris-g++/qplatformdefs.h
-qt5/mkspecs/tru64-cxx/qmake.conf
-qt5/mkspecs/tru64-cxx/qplatformdefs.h
-qt5/mkspecs/tru64-g++/qmake.conf
-qt5/mkspecs/tru64-g++/qplatformdefs.h
-qt5/mkspecs/unixware-cc/qmake.conf
-qt5/mkspecs/unixware-cc/qplatformdefs.h
-qt5/mkspecs/unixware-g++/qmake.conf
-qt5/mkspecs/unixware-g++/qplatformdefs.h
-qt5/mkspecs/unsupported/android-g++/qeglfshooks_surfaceflinger.cpp
-qt5/mkspecs/unsupported/android-g++/qmake.conf
-qt5/mkspecs/unsupported/android-g++/qplatformdefs.h
-qt5/mkspecs/unsupported/freebsd-clang/qmake.conf
-qt5/mkspecs/unsupported/freebsd-clang/qplatformdefs.h
-qt5/mkspecs/unsupported/linux-armcc/qmake.conf
-qt5/mkspecs/unsupported/linux-armcc/qplatformdefs.h
qt5/mkspecs/unsupported/linux-host-g++/qmake.conf
qt5/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
qt5/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
@@ -2878,65 +3117,46 @@ qt5/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
qt5/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
qt5/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
qt5/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
+qt5/mkspecs/win32-clang-msvc/qmake.conf
+qt5/mkspecs/win32-clang-msvc/qplatformdefs.h
qt5/mkspecs/win32-g++/qmake.conf
qt5/mkspecs/win32-g++/qplatformdefs.h
+qt5/mkspecs/win32-icc-k1om/qmake.conf
+qt5/mkspecs/win32-icc-k1om/qplatformdefs.h
qt5/mkspecs/win32-icc/qmake.conf
qt5/mkspecs/win32-icc/qplatformdefs.h
-qt5/mkspecs/win32-msvc2005/qmake.conf
-qt5/mkspecs/win32-msvc2005/qplatformdefs.h
-qt5/mkspecs/win32-msvc2008/qmake.conf
-qt5/mkspecs/win32-msvc2008/qplatformdefs.h
-qt5/mkspecs/win32-msvc2010/qmake.conf
-qt5/mkspecs/win32-msvc2010/qplatformdefs.h
-qt5/mkspecs/win32-msvc2012/qmake.conf
-qt5/mkspecs/win32-msvc2012/qplatformdefs.h
-qt5/mkspecs/win32-msvc2013/qmake.conf
-qt5/mkspecs/win32-msvc2013/qplatformdefs.h
-qt5/mkspecs/win32-msvc2015/qmake.conf
-qt5/mkspecs/win32-msvc2015/qplatformdefs.h
-qt5/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf
-qt5/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h
-qt5/mkspecs/wince60standard-x86-msvc2005/qmake.conf
-qt5/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h
-qt5/mkspecs/wince70embedded-armv4i-msvc2008/qmake.conf
-qt5/mkspecs/wince70embedded-armv4i-msvc2008/qplatformdefs.h
-qt5/mkspecs/wince70embedded-x86-msvc2008/qmake.conf
-qt5/mkspecs/wince70embedded-x86-msvc2008/qplatformdefs.h
-qt5/mkspecs/wince80colibri-armv7-msvc2012/qmake.conf
-qt5/mkspecs/wince80colibri-armv7-msvc2012/qplatformdefs.h
-qt5/mkspecs/winphone-arm-msvc2013/qmake.conf
-qt5/mkspecs/winphone-arm-msvc2013/qplatformdefs.h
-qt5/mkspecs/winphone-x86-msvc2013/qmake.conf
-qt5/mkspecs/winphone-x86-msvc2013/qplatformdefs.h
-qt5/mkspecs/winrt-arm-msvc2013/qmake.conf
-qt5/mkspecs/winrt-arm-msvc2013/qplatformdefs.h
+qt5/mkspecs/win32-msvc/qmake.conf
+qt5/mkspecs/win32-msvc/qplatformdefs.h
qt5/mkspecs/winrt-arm-msvc2015/qmake.conf
qt5/mkspecs/winrt-arm-msvc2015/qplatformdefs.h
-qt5/mkspecs/winrt-x64-msvc2013/qmake.conf
-qt5/mkspecs/winrt-x64-msvc2013/qplatformdefs.h
+qt5/mkspecs/winrt-arm-msvc2017/qmake.conf
+qt5/mkspecs/winrt-arm-msvc2017/qplatformdefs.h
qt5/mkspecs/winrt-x64-msvc2015/qmake.conf
qt5/mkspecs/winrt-x64-msvc2015/qplatformdefs.h
-qt5/mkspecs/winrt-x86-msvc2013/qmake.conf
-qt5/mkspecs/winrt-x86-msvc2013/qplatformdefs.h
-${PLIST.mac}qt5/plugins/bearer/libqcorewlanbearer.la
+qt5/mkspecs/winrt-x64-msvc2017/qmake.conf
+qt5/mkspecs/winrt-x64-msvc2017/qplatformdefs.h
qt5/mkspecs/winrt-x86-msvc2015/qmake.conf
qt5/mkspecs/winrt-x86-msvc2015/qplatformdefs.h
-qt5/plugins/bearer/libqgenericbearer.la
-${PLIST.egl}qt5/plugins/egldeviceintegrations/libqeglfs-x11-integration.la
-qt5/plugins/generic/libqtuiotouchplugin.la
-qt5/plugins/imageformats/libqgif.la
-qt5/plugins/imageformats/libqico.la
-qt5/plugins/imageformats/libqjpeg.la
-${PLIST.unix}qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.la
-${PLIST.unix}qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.la
-${PLIST.mac}qt5/plugins/platforms/libqcocoa.la
-${PLIST.egl}qt5/plugins/platforms/libqeglfs.la
-qt5/plugins/platforms/libqminimal.la
-${PLIST.egl}qt5/plugins/platforms/libqminimalegl.la
-qt5/plugins/platforms/libqoffscreen.la
-${PLIST.unix}qt5/plugins/platforms/libqxcb.la
-${PLIST.gtk2}qt5/plugins/platformthemes/libqgtk2.la
-${PLIST.mac}qt5/plugins/printsupport/libcocoaprintersupport.la
-${PLIST.cups}qt5/plugins/printsupport/libcupsprintersupport.la
-${PLIST.unix}qt5/plugins/xcbglintegrations/libqxcb-glx-integration.la
-${PLIST.egl}qt5/plugins/xcbglintegrations/libqxcb-egl-integration.la
+qt5/mkspecs/winrt-x86-msvc2017/qmake.conf
+qt5/mkspecs/winrt-x86-msvc2017/qplatformdefs.h
+qt5/plugins/bearer/libqgenericbearer.so
+${PLIST.egl}qt5/plugins/egldeviceintegrations/libqeglfs-emu-integration.so
+${PLIST.egl}qt5/plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
+${PLIST.egl}qt5/plugins/egldeviceintegrations/libqeglfs-kms-integration.so
+${PLIST.egl}qt5/plugins/egldeviceintegrations/libqeglfs-x11-integration.so
+qt5/plugins/generic/libqtuiotouchplugin.so
+qt5/plugins/imageformats/libqgif.so
+qt5/plugins/imageformats/libqico.so
+qt5/plugins/imageformats/libqjpeg.so
+${PLIST.unix}qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
+${PLIST.unix}qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
+${PLIST.egl}qt5/plugins/platforms/libqeglfs.so
+qt5/plugins/platforms/libqminimal.so
+qt5/plugins/platforms/libqminimalegl.so
+qt5/plugins/platforms/libqoffscreen.so
+${PLIST.unix}qt5/plugins/platforms/libqvnc.so
+${PLIST.unix}qt5/plugins/platforms/libqxcb.so
+${PLIST.cups}qt5/plugins/printsupport/libcupsprintersupport.so
+qt5/plugins/sqldrivers/libqsqlite.so
+${PLIST.egl}qt5/plugins/xcbglintegrations/libqxcb-egl-integration.so
+${PLIST.unix}qt5/plugins/xcbglintegrations/libqxcb-glx-integration.so
diff --git a/x11/qt5-qtbase/PLIST.Darwin b/x11/qt5-qtbase/PLIST.Darwin
new file mode 100644
index 00000000000..64d327b8767
--- /dev/null
+++ b/x11/qt5-qtbase/PLIST.Darwin
@@ -0,0 +1,25 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2018/01/17 19:30:46 markd Exp $
+qt5/include/QtClipboardSupport/${PKGVERSION}/QtClipboardSupport/private/qmacmime_p.h
+qt5/include/QtClipboardSupport/QtClipboardSupport
+qt5/include/QtClipboardSupport/QtClipboardSupportDepends
+qt5/include/QtClipboardSupport/QtClipboardSupportVersion
+qt5/include/QtClipboardSupport/qtclipboardsupportversion.h
+qt5/include/QtGraphicsSupport/${PKGVERSION}/QtGraphicsSupport/private/qrasterbackingstore_p.h
+qt5/include/QtGraphicsSupport/QtGraphicsSupport
+qt5/include/QtGraphicsSupport/QtGraphicsSupportDepends
+qt5/include/QtGraphicsSupport/QtGraphicsSupportVersion
+qt5/include/QtGraphicsSupport/qtgraphicssupportversion.h
+qt5/lib/cmake/Qt5Gui/Qt5Gui_QCocoaIntegrationPlugin.cmake
+qt5/lib/cmake/Qt5Network/Qt5Network_QCoreWlanEnginePlugin.cmake
+qt5/lib/cmake/Qt5PrintSupport/Qt5PrintSupport_QCocoaPrinterSupportPlugin.cmake
+qt5/lib/cmake/Qt5Widgets/Qt5Widgets_QMacStylePlugin.cmake
+qt5/lib/libQt5ClipboardSupport.a
+qt5/lib/libQt5ClipboardSupport.prl
+qt5/lib/libQt5GraphicsSupport.a
+qt5/lib/libQt5GraphicsSupport.prl
+qt5/mkspecs/modules/qt_lib_clipboard_support_private.pri
+qt5/mkspecs/modules/qt_lib_graphics_support_private.pri
+qt5/plugins/bearer/libqcorewlanbearer.so
+qt5/plugins/platforms/libqcocoa.so
+qt5/plugins/printsupport/libcocoaprintersupport.so
+qt5/plugins/styles/libqmacstyle.so
diff --git a/x11/qt5-qtbase/PLIST.Linux b/x11/qt5-qtbase/PLIST.Linux
index 02433436f7b..08db29d9273 100644
--- a/x11/qt5-qtbase/PLIST.Linux
+++ b/x11/qt5-qtbase/PLIST.Linux
@@ -1,4 +1,26 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2016/01/03 21:15:57 markd Exp $
+@comment $NetBSD: PLIST.Linux,v 1.3 2018/01/17 19:30:46 markd Exp $
+qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboard_defaultmap_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qevdevkeyboardhandler_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qevdevkeyboardmanager_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qevdevmousehandler_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qevdevmousemanager_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qevdevtablethandler_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qevdevtabletmanager_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qevdevtouchfilter_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qevdevtouchhandler_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qevdevtouchmanager_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qlibinputhandler_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qlibinputkeyboard_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qlibinputpointer_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qlibinputtouch_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qtouchoutputmapping_p.h
+qt5/include/QtInputSupport/5.10.0/QtInputSupport/private/qtslib_p.h
+qt5/include/QtInputSupport/QIntegrityHIDManager
+qt5/include/QtInputSupport/qintegrityhidmanager.h
+qt5/include/QtInputSupport/QtInputSupport
+qt5/include/QtInputSupport/QtInputSupportDepends
+qt5/include/QtInputSupport/QtInputSupportVersion
+qt5/include/QtInputSupport/qtinputsupportversion.h
qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevTabletPlugin.cmake
@@ -6,10 +28,13 @@ qt5/lib/cmake/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake
qt5/lib/cmake/Qt5Network/Qt5Network_QConnmanEnginePlugin.cmake
qt5/lib/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.cmake
-qt5/plugins/bearer/libqconnmanbearer.la
-qt5/plugins/bearer/libqnmbearer.la
-qt5/plugins/generic/libqevdevkeyboardplugin.la
-qt5/plugins/generic/libqevdevmouseplugin.la
-qt5/plugins/generic/libqevdevtabletplugin.la
-qt5/plugins/generic/libqevdevtouchplugin.la
-qt5/plugins/platforms/libqlinuxfb.la
+qt5/lib/libQt5InputSupport.a
+qt5/lib/libQt5InputSupport.prl
+qt5/mkspecs/modules/qt_lib_input_support_private.pri
+qt5/plugins/bearer/libqconnmanbearer.so
+qt5/plugins/bearer/libqnmbearer.so
+qt5/plugins/generic/libqevdevkeyboardplugin.so
+qt5/plugins/generic/libqevdevmouseplugin.so
+qt5/plugins/generic/libqevdevtabletplugin.so
+qt5/plugins/generic/libqevdevtouchplugin.so
+qt5/plugins/platforms/libqlinuxfb.so
diff --git a/x11/qt5-qtbase/buildlink3.mk b/x11/qt5-qtbase/buildlink3.mk
index b8be28cc9fb..b29991ed252 100644
--- a/x11/qt5-qtbase/buildlink3.mk
+++ b/x11/qt5-qtbase/buildlink3.mk
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2018/01/17 19:30:46 markd Exp $
BUILDLINK_TREE+= qt5-qtbase
.if !defined(QT5_QTBASE_BUILDLINK3_MK)
QT5_QTBASE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.5.1nb18
+BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.9.1
BUILDLINK_PKGSRCDIR.qt5-qtbase?= ../../x11/qt5-qtbase
BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include
BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib
BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins
-QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5
+QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5
CMAKE_PREFIX_PATH+= ${QTDIR}
CONFIGURE_ENV+= QTDIR=${QTDIR}
@@ -24,30 +24,34 @@ PTHREAD_OPTS+= require
.include "../../mk/bsd.fast.prefs.mk"
.include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../fonts/harfbuzz/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
+.include "../../www/libproxy/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.if ${OPSYS} != "Darwin"
+.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../x11/libxcb/buildlink3.mk"
.include "../../x11/xcb-util/buildlink3.mk"
.include "../../x11/xcb-util-image/buildlink3.mk"
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
+.include "../../x11/xcb-util-renderutil/buildlink3.mk"
.include "../../x11/xcb-util-wm/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXcursor/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo
index 366a3c622f7..b439444d9bd 100644
--- a/x11/qt5-qtbase/distinfo
+++ b/x11/qt5-qtbase/distinfo
@@ -1,39 +1,26 @@
-$NetBSD: distinfo,v 1.34 2017/11/13 17:36:11 minskim Exp $
+$NetBSD: distinfo,v 1.35 2018/01/17 19:30:46 markd Exp $
-SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f
-RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44
-SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575
-Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes
-SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764
-SHA1 (patch-configure) = 482815b5f3ec25fabe0995cfc70acf164928d192
+SHA1 (qtbase-everywhere-src-5.10.0.tar.xz) = 34fa3d4e7bb2b1545247a616190efaf74804db49
+RMD160 (qtbase-everywhere-src-5.10.0.tar.xz) = d6f9ab8526ebe50791b9b948930806dc8b3be73b
+SHA512 (qtbase-everywhere-src-5.10.0.tar.xz) = 8f832fb7bc5087df4b897cd23145e5350f03ca06e2fc5ccb11a7b998e4885c1b936c3e4b989c15fc076134a6a081a35efa37f402b5e8b85e2c780006641b2cdc
+Size (qtbase-everywhere-src-5.10.0.tar.xz) = 45851596 bytes
+SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = ffd0107d57e308aa83a780818756c9a538efc591
+SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
SHA1 (patch-mkspecs_features_create__cmake.prf) = 3f6b3a592e29f5529e5c87dbac036c165470eac4
-SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177
-SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39
-SHA1 (patch-mkspecs_features_simd.prf) = 7dbe61df6252adebeac374e3541bc5ff4c93909b
-SHA1 (patch-qmake_Makefile.unix) = c14d72bb76d469df3b730a105473b47f3a05850b
-SHA1 (patch-qmake_generators_makefile.cpp) = 08bdf7b58fb7e5bd2a1c31f0a0344c733b65acb3
-SHA1 (patch-qmake_generators_unix_unixmake.cpp) = f8d2b60473b19cfab76cca1b886f71030674099d
-SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 528d7ea009dd9dd698009d7797d0b23dd469d995
-SHA1 (patch-qmake_qmake.pri) = 142f2b7d0dbfbc829afc9f83bf8be8b3054b8cf7
-SHA1 (patch-src_concurrent_qtconcurrentiteratekernel.cpp) = 295cf573cf435e0edeeefb49144f84c7c6e7559c
-SHA1 (patch-src_corelib_arch_sparc_arch.pri) = cb95ec1bb7aa6084f14dff5828854deed54b8ca1
-SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66fd1b85d101
-SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180
-SHA1 (patch-src_corelib_io_io.pri) = 9a59b621441291f388860b523f80b59730632328
-SHA1 (patch-src_corelib_io_qlockfile__unix.cpp) = f07812f0867bd04dfdea736847a668843a5fe646
+SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
+SHA1 (patch-qmake_Makefile.unix) = ec1af3d76dc5bd0b7b1d375ceeebbd016b6f555f
+SHA1 (patch-qmake_generators_makefile.cpp) = 26366f21108534a321d9d7c7f87066e9acf7d981
+SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = f0a4fdd304af2ee6c1b63022ccfcebd2640f0fcb
+SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = 4387447f0f23f0f8c623c0c019ab632bc1cb5617
+SHA1 (patch-src_corelib_io_io.pri) = fd2f93b5af4dda729b274dd0d8f82ca29b3cb62a
SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938
-SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 688de65bf3364cb8c982a7f82c9b67f5ecbebd10
-SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 331c3ced6554da7164a6927b0d8052447ae804d0
-SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d
-SHA1 (patch-src_openglextensions_openglextensions.pro) = e79effc1433ddda744b79d7e1f47764fee406580
-SHA1 (patch-src_platformsupport_devicediscovery_devicediscovery.pri) = 2cd24768b41c813d0aee0943f97f913308794611
-SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081
-SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 86f828bd545fe53c626fde0a645213077b88ef64
-SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 98a715ce225fcf698cc8389adef82bb67be8310d
-SHA1 (patch-src_plugins_platforms_cocoa_qcocoahelpers.h) = cc62ac13e3a13c259743147a75b5ceec02c36c67
-SHA1 (patch-src_plugins_platforms_cocoa_qcocoahelpers.mm) = 7a98e395ed690db8d0e680b09be00506fd2ddbd2
-SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = 0eb333ed8193ef056dc2c4ed99fb9d207c31fa02
+SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
+SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 37f61c305335ca6a690b0491220ca8de508bfdb6
+SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 3131d74a547abdcca7594b49b739cc1c0eed68f5
+SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f
+SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 1655b2320b250defcfa406c95e58a1b728c0f2d9
+SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 655ca6601ddd1768b92758cfdfd8d1c3514fba94
SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb
SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1
-SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 7d5ccb008a30238fcf35e763832a494af51ed0ac
+SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 1dbb08e5ec6715cbe239efdfb45389959b179ea3
SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1
diff --git a/x11/qt5-qtbase/files/qmake.conf b/x11/qt5-qtbase/files/qmake.conf
index bf2e98c328c..7ea283302ac 100644
--- a/x11/qt5-qtbase/files/qmake.conf
+++ b/x11/qt5-qtbase/files/qmake.conf
@@ -3,25 +3,21 @@
#
MAKEFILE_GENERATOR = UNIX
-QMAKE_PLATFORM = unix
CONFIG += qt warn_on release link_prl incremental gdb_dwarf_index
-CONFIG += compile_libtool
QMAKE_INCREMENTAL_STYLE = sublib
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+include(../common/unix.conf)
+
QMAKE_COMPILER = @CC@
QMAKE_CC = @CC@
+QMAKE_CXX = @CXX@
+QMAKE_CFLAGS = @CFLAGS@
+QMAKE_CXXFLAGS = @CXXFLAGS@
QMAKE_LEX = @LEX@
-QMAKE_LEXFLAGS =
QMAKE_YACC = @YACC@
-QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = @CFLAGS@
-#QMAKE_CFLAGS_THREAD = -D_REENTRANT
-
-QMAKE_CXX = @CXX@
-QMAKE_CXXFLAGS = @CXXFLAGS@ -DQ_TRAILING_DIR_SEP
-# alloca usage requires GNU extensions
-QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
QMAKE_INCDIR = @LOCALBASE@/include
QMAKE_LIBDIR = @LOCALBASE@/lib
@@ -30,22 +26,11 @@ QMAKE_LIBDIR_X11 = @X11BASE@/lib
QMAKE_INCDIR_OPENGL = @X11BASE@/include
QMAKE_LIBDIR_OPENGL = @X11BASE@/lib
-QMAKE_LINK = @CXX@
-QMAKE_LINK_SHLIB = @CXX@
-QMAKE_LINK_C = @CC@
-QMAKE_LINK_C_SHLIB = @CC@
-QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
+QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-# --- from gcc-base-unix.conf
-#QMAKE_LFLAGS_SHLIB = -Wl,-Bdynamic
-#QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
-#QMAKE_LFLAGS_SONAME = -Wl,-soname,
+QMAKE_LFLAGS = @LDFLAGS@
+QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
QMAKE_LFLAGS_THREAD = @PTHREAD_LDFLAGS@
-#QMAKE_LFLAGS_RPATH = -rpath
-# -Bsymbolic-functions (ld) support
-#QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
-#QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
-# ---
QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD =
@@ -56,6 +41,7 @@ QMAKE_LIBS_THREAD = @PTHREAD_LIBS@
QMAKE_AR = @AR@ cqs
QMAKE_OBJCOPY = objcopy
+QMAKE_NM = nm -P
QMAKE_RANLIB = @QMAKE_RANLIB@
QMAKE_MOC = $(QTDIR)/bin/moc
@@ -65,6 +51,4 @@ QMAKE_RCC = $(QTDIR)/bin/rcc
QMAKE_MKDIR = @MKDIR@
-include(../common/gcc-base-unix.conf)
-include(../common/unix.conf)
load(qt_config)
diff --git a/x11/qt5-qtbase/files/qmake.conf.mac b/x11/qt5-qtbase/files/qmake.conf.mac
index b2344287111..8b2b616a323 100644
--- a/x11/qt5-qtbase/files/qmake.conf.mac
+++ b/x11/qt5-qtbase/files/qmake.conf.mac
@@ -3,49 +3,53 @@
#
MAKEFILE_GENERATOR = UNIX
-QMAKE_PLATFORM = darwin mac macx osx
+QMAKE_PLATFORM = darwin mac macos macx osx
CONFIG += qt warn_on release link_prl incremental global_init_link_order lib_version_first plugin_no_soname
-CONFIG += compile_libtool
+CONFIG += objective_c
QMAKE_INCREMENTAL_STYLE = sublib
+# this is a hack: 'moc' does not see the definition of Q_OS_MAC
+# it probably works correctly with CONFIG += sdk
+# see https://bugreports.qt.io/browse/QTBUG-56193
+QMAKE_COMPILER_DEFINES += TARGET_OS_MAC
+
+include(../common/gcc-base-mac.conf)
+include(../common/g++-unix.conf)
+include(../common/unix.conf)
QMAKE_COMPILER = @CC@
QMAKE_CC = @CC@
+QMAKE_CXX = @CXX@
+QMAKE_CFLAGS = @CFLAGS@
+QMAKE_CXXFLAGS = @CXXFLAGS@
QMAKE_LEX = @LEX@
-QMAKE_LEXFLAGS =
QMAKE_YACC = @YACC@
-QMAKE_CFLAGS = @CFLAGS@
-#QMAKE_CFLAGS_THREAD = -D_REENTRANT
-
-QMAKE_CXX = @CXX@
-QMAKE_CXXFLAGS = @CXXFLAGS@ -DQ_TRAILING_DIR_SEP
-QMAKE_CXXFLAGS_CXX11 = -std=c++0x
QMAKE_INCDIR = @LOCALBASE@/include
QMAKE_LIBDIR = @LOCALBASE@/lib
-#QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \
-# /System/Library/Frameworks/AGL.framework/Headers/
-
-QMAKE_LINK = @CXX@
-QMAKE_LINK_SHLIB = @CXX@
-QMAKE_LINK_C = @CC@
-QMAKE_LINK_C_SHLIB = @CC@
-QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
+
+QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
+
QMAKE_LFLAGS = @LDFLAGS@
-QMAKE_LFLAGS_RPATH =
+QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
+QMAKE_LFLAGS_RPATH = -Wl,-rpath,
QMAKE_LFLAGS_THREAD = @PTHREAD_LDFLAGS@
+# Do not add -all_load, or build fails with duplicate symbols (in bearer).
# -all_load required to make Objective-C categories work in static builds.
-QMAKE_LFLAGS_STATIC_LIB = -all_load
+QMAKE_LFLAGS_STATIC_LIB =
QMAKE_FIX_RPATH = install_name_tool -id
QMAKE_EXTENSION_SHLIB = dylib
+QMAKE_REL_RPATH_BASE = @loader_path
QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_THREAD =
QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL
+QMAKE_ACTOOL = actool
QMAKE_AR = @AR@ cq
+QMAKE_DSYMUTIL = dsymutil
QMAKE_NM = nm -P
QMAKE_RANLIB = @QMAKE_RANLIB@
@@ -56,6 +60,4 @@ QMAKE_RCC = $(QTDIR)/bin/rcc
QMAKE_MKDIR = @MKDIR@
-include(../common/gcc-base-mac.conf)
-include(../common/unix.conf)
load(qt_config)
diff --git a/x11/qt5-qtbase/options.mk b/x11/qt5-qtbase/options.mk
index 645dc0c62fb..12be2dc2b3f 100644
--- a/x11/qt5-qtbase/options.mk
+++ b/x11/qt5-qtbase/options.mk
@@ -1,11 +1,12 @@
-# $NetBSD: options.mk,v 1.9 2017/11/12 15:37:00 khorben Exp $
+# $NetBSD: options.mk,v 1.10 2018/01/17 19:30:46 markd Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qt5
-PKG_SUPPORTED_OPTIONS= cups debug gtk2
+PKG_SUPPORTED_OPTIONS= cups eglfs gtk3
+#PKG_SUGGESTED_OPTIONS= cups
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= cups gtk2
+PLIST_VARS+= cups gtk3
.if !empty(PKG_OPTIONS:Mcups)
. include "../../print/cups-base/buildlink3.mk"
@@ -15,21 +16,16 @@ PLIST.cups= yes
CONFIGURE_ARGS+= -no-cups
.endif
-.if !empty(PKG_OPTIONS:Mgtk2)
-. include "../../x11/gtk2/buildlink3.mk"
-CONFIGURE_ARGS+= -gtkstyle
-PLIST.gtk2= yes
-.else
-CONFIGURE_ARGS+= -no-gtkstyle
-.endif
+#.if !empty(PKG_OPTIONS:Megl)
+#CONFIGURE_ARGS+= -no-eglfs
+#.else
+#CONFIGURE_ARGS+= -no-eglfs
+#.endif
-.if !empty(PKG_OPTIONS:Mdebug)
-# this does not work - builds libQtBoostracp_debug
-CC+= -ggdb
-CXX+= -ggdb
-CONFIGURE_ARGS+= -debug
-INSTALL_UNSTRIPPED= yes
+.if !empty(PKG_OPTIONS:Mgtk3)
+. include "../../x11/gtk3/buildlink3.mk"
+CONFIGURE_ARGS+= -gtk
+PLIST.gtk2= yes
.else
-CONFIGURE_ARGS+= -release
-CONFIGURE_ARGS+= -no-debug
+CONFIGURE_ARGS+= -no-gtk
.endif
diff --git a/x11/qt5-qtbase/patches/patch-config.tests_unix_iconv_iconv.cpp b/x11/qt5-qtbase/patches/patch-config.tests_unix_iconv_iconv.cpp
index 5c3cda5b9ca..766f7bb8d9e 100644
--- a/x11/qt5-qtbase/patches/patch-config.tests_unix_iconv_iconv.cpp
+++ b/x11/qt5-qtbase/patches/patch-config.tests_unix_iconv_iconv.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-config.tests_unix_iconv_iconv.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
+$NetBSD: patch-config.tests_unix_iconv_iconv.cpp,v 1.2 2018/01/17 19:30:47 markd Exp $
-* Fix for NetBSD iconv(3)
+Fix for NetBSD iconv(3)
---- config.tests/unix/iconv/iconv.cpp.orig 2013-11-27 01:01:17.000000000 +0000
-+++ config.tests/unix/iconv/iconv.cpp
-@@ -48,7 +48,11 @@ int main(int, char **)
+--- config.tests/iconv/iconv.cpp.orig 2017-10-02 08:43:38.000000000 +0000
++++ config.tests/iconv/iconv.cpp
+@@ -43,7 +43,11 @@ int main(int, char **)
{
iconv_t x = iconv_open("", "");
diff --git a/x11/qt5-qtbase/patches/patch-configure b/x11/qt5-qtbase/patches/patch-configure
index 03ce9d63cd3..d6a78249c38 100644
--- a/x11/qt5-qtbase/patches/patch-configure
+++ b/x11/qt5-qtbase/patches/patch-configure
@@ -1,38 +1,21 @@
-$NetBSD: patch-configure,v 1.4 2016/03/14 06:12:17 dbj Exp $
+$NetBSD: patch-configure,v 1.5 2018/01/17 19:30:47 markd Exp $
-* Don't use SDKs on OS X
-* Add NetBSD/sparc{,64} support
+Don't use SDKs on OS X
+Add NetBSD/sparc{,64} support
---- configure.orig 2015-10-13 04:35:07.000000000 +0000
+--- configure.orig 2017-05-26 12:43:31.000000000 +0000
+++ configure
-@@ -337,7 +337,6 @@ getQMakeConf()
+@@ -292,7 +292,6 @@ getQMakeConf()
{
if [ -z "$specvals" ]; then
- specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables "host_build"`
+ specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables`
- if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi
fi
getSingleQMakeVariable "$1" "$specvals"
}
-@@ -346,7 +345,6 @@ getXQMakeConf()
- {
- if [ -z "$xspecvals" ]; then
- xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" | extractQMakeVariables "!host_build"`
-- if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi
- fi
- getSingleQMakeVariable "$1" "$xspecvals"
- }
-@@ -527,7 +525,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
- exit 2
- fi
-
-- if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
-+ if ! /usr/bin/xcrun -find cc >/dev/null 2>&1; then
- echo >&2
- echo " Xcode not set up properly. You may need to confirm the license" >&2
- echo " agreement by running /usr/bin/xcodebuild without arguments." >&2
-@@ -2897,6 +2895,19 @@ if [ -z "$PLATFORM" ]; then
- UNIX_SV:*)
- PLATFORM=unixware-g++
+@@ -605,6 +604,19 @@ if [ -z "$PLATFORM" ]; then
+ LynxOS*:*)
+ PLATFORM=lynxos-g++
;;
+ NetBSD:*:sparc)
+ if [ "$OPT_VERBOSE" = "yes" ]; then
@@ -50,32 +33,3 @@ $NetBSD: patch-configure,v 1.4 2016/03/14 06:12:17 dbj Exp $
QNX:*)
PLATFORM=unsupported/qnx-g++
;;
-@@ -3471,11 +3482,11 @@ if [ "$CFG_USE_GOLD_LINKER" != "no" ]; t
- fi
-
- # auto-detect --enable-new-dtags support
--if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then
-- CFG_ENABLE_NEW_DTAGS=yes
--else
-+#if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then
-+# CFG_ENABLE_NEW_DTAGS=yes
-+#else
- CFG_ENABLE_NEW_DTAGS=no
--fi
-+#fi
-
- # auto-detect -fstack-protector-strong support (for QNX only currently)
- if [ "$XPLATFORM_QNX" = "yes" ]; then
-@@ -4014,10 +4025,12 @@ if true; then ###[ '!' -f "$outpath/bin/
- EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
- EXTRA_OBJS="$EXTRA_OBJS \
- qsettings_mac.o \
-+ qstring_mac.o \
- qcore_mac.o \
- qcore_mac_objc.o"
- EXTRA_SRCS="$EXTRA_SRCS \
- \"\$(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp\" \
-+ \"\$(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm\" \
- \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \
- \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\""
- fi
diff --git a/x11/qt5-qtbase/patches/patch-mkspecs_features_mac_objective__c.prf b/x11/qt5-qtbase/patches/patch-mkspecs_features_mac_objective__c.prf
deleted file mode 100644
index 4eaff31f3c1..00000000000
--- a/x11/qt5-qtbase/patches/patch-mkspecs_features_mac_objective__c.prf
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-mkspecs_features_mac_objective__c.prf,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-Use LIBTOOL for objective-c sources.
-
---- mkspecs/features/mac/objective_c.prf.orig 2014-02-01 20:37:37.000000000 +0000
-+++ mkspecs/features/mac/objective_c.prf
-@@ -15,8 +15,8 @@ isEmpty(QMAKE_EXT_OBJECTIVE_C):QMAKE_EXT
-
- objective_c.dependency_type = TYPE_C
- objective_c.variables = QMAKE_OBJECTIVE_CFLAGS
--objective_c.commands = $$QMAKE_OBJECTIVE_CC -c $(QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS) $(DEFINES) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
--objective_c.output = $$OBJECTIVE_C_OBJECTS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-+objective_c.commands = $(LIBTOOL) --mode=compile $$QMAKE_OBJECTIVE_CC -c $(QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS) $(DEFINES) $(INCPATH) ${QMAKE_FILE_IN} -o $$OBJECTIVE_C_OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
-+objective_c.output = $$OBJECTIVE_C_OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
- objective_c.input = OBJECTIVE_SOURCES
- objective_c.name = Compile ${QMAKE_FILE_IN}
- silent:objective_c.commands = @echo objective-c ${QMAKE_FILE_IN} && $$objective_c.commands
diff --git a/x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module.prf b/x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module.prf
new file mode 100644
index 00000000000..783f4e19caa
--- /dev/null
+++ b/x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module.prf
@@ -0,0 +1,14 @@
+$NetBSD: patch-mkspecs_features_qt__module.prf,v 1.1 2018/01/17 19:30:47 markd Exp $
+
+Do not create .la files.
+
+--- mkspecs/features/qt_module.prf.orig 2017-06-08 18:57:48.000000000 +0000
++++ mkspecs/features/qt_module.prf
+@@ -286,7 +286,6 @@ load(qt_targets)
+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
+ }
+ !lib_bundle:unix {
+- CONFIG += create_libtool
+ host_build: \
+ QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
+ else: \
diff --git a/x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module__pris.prf b/x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module__pris.prf
deleted file mode 100644
index f47a6b42873..00000000000
--- a/x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module__pris.prf
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mkspecs_features_qt__module__pris.prf,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-* Build libtoolized shared libraries
-
---- mkspecs/features/qt_module_pris.prf.orig 2013-11-27 01:01:16.000000000 +0000
-+++ mkspecs/features/qt_module_pris.prf
-@@ -59,7 +59,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$
- else: \
- module_rundep =
- static: \
-- module_build_type = staticlib
-+ module_build_type =
- else:mac:contains(QT_CONFIG, qt_framework): \
- module_build_type = lib_bundle
- else: \
diff --git a/x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf b/x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf
deleted file mode 100644
index 1bcf201745c..00000000000
--- a/x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-mkspecs_features_simd.prf,v 1.2 2015/10/26 19:03:59 adam Exp $
-
-* Use libtool
-
---- mkspecs/features/simd.prf.orig 2014-12-05 16:24:38.000000000 +0000
-+++ mkspecs/features/simd.prf
-@@ -33,12 +33,12 @@ defineTest(addSimdCompiler) {
- export(SOURCES)
- } else {
- # We need special compiler flags
-- $${name}_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS) $$cflags $(INCPATH) ${QMAKE_FILE_IN}
-+ $${name}_compiler.commands = $(LIBTOOL) --silent --mode=compile $$QMAKE_CXX -c $(CXXFLAGS) $$cflags $(INCPATH) ${QMAKE_FILE_IN}
- msvc: $${name}_compiler.commands += -Fo${QMAKE_FILE_OUT}
-- else: $${name}_compiler.commands += -o ${QMAKE_FILE_OUT}
-+ else: $${name}_compiler.commands += -o $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
-
- $${name}_compiler.dependency_type = TYPE_C
-- $${name}_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-+ $${name}_compiler.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
- $${name}_compiler.input = $$sources_var
- $${name}_compiler.variable_out = OBJECTS
- $${name}_compiler.name = compiling[$${name}] ${QMAKE_FILE_IN}
-@@ -62,12 +62,12 @@ defineTest(addSimdCompiler) {
- SOURCES += $$eval($$asm_var)
- export(SOURCES)
- } else {
-- $${name}_assembler.commands = $$QMAKE_CC -c $(CFLAGS)
-+ $${name}_assembler.commands = $(LIBTOOL) --silent --mode=compile $$QMAKE_CC -c $(CFLAGS)
- !contains(QT_CPU_FEATURES, $${name}): $${name}_assembler.commands += $$cflags
- clang:no_clang_integrated_as: $${name}_assembler.commands += -fno-integrated-as
-- $${name}_assembler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
-+ $${name}_assembler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
- $${name}_assembler.dependency_type = TYPE_C
-- $${name}_assembler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-+ $${name}_assembler.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
- $${name}_assembler.input = $$asm_var
- $${name}_assembler.variable_out = OBJECTS
- $${name}_assembler.name = assembling[$${name}] ${QMAKE_FILE_IN}
diff --git a/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix b/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix
index c17fd96f9d6..4982edc04d4 100644
--- a/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix
+++ b/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix
@@ -1,49 +1,26 @@
-$NetBSD: patch-qmake_Makefile.unix,v 1.3 2017/07/11 10:52:41 wiz Exp $
+$NetBSD: patch-qmake_Makefile.unix,v 1.4 2018/01/17 19:30:47 markd Exp $
-* Pass environmental variables from pkgsrc
+Pass environmental variables from pkgsrc
---- qmake/Makefile.unix.orig 2015-10-13 04:35:09.000000000 +0000
+--- qmake/Makefile.unix.orig 2017-11-30 13:49:46.000000000 +0000
+++ qmake/Makefile.unix
-@@ -74,6 +74,7 @@ DEPEND_SRC = \
- $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp \
- $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp \
- $(SOURCE_PATH)/src/corelib/tools/qhash.cpp $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp \
-+ $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm \
- $(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm \
- $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \
- $(SOURCE_PATH)/src/corelib/io/qsettings.cpp $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
-@@ -93,7 +94,7 @@ DEPEND_SRC = \
- $(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp \
- $(QTSRCS)
+@@ -130,7 +130,7 @@ DEPEND_SRC = \
+ # by configure); QTSRCS2 may include *.mm entries on macOS.
+ # See below for special handling of qlibraryinfo.cpp
-CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
+CPPFLAGS += -g $(EXTRA_CPPFLAGS) \
- -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$(QMKSRC)/generators/win32 \
- -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \
+ -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKGENSRC) \
+ -I$(QMKGENSRC)/unix -I$(QMKGENSRC)/win32 -I$(QMKGENSRC)/mac \
-I$(INC_PATH) -I$(INC_PATH)/QtCore \
-@@ -106,13 +107,13 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
- -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
- -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_JSON_READONLY -DQT_NO_STANDARDPATHS
+@@ -141,8 +141,8 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
+ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \
+ -DQT_NO_FOREACH
--CXXFLAGS = $(EXTRA_CXXFLAGS) $(CPPFLAGS)
-+CXXFLAGS += $(EXTRA_CXXFLAGS) $(CPPFLAGS)
+-CXXFLAGS = $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS)
+-LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS)
++CXXFLAGS += $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS)
++LFLAGS = $(LDFLAGS) $(EXTRA_LFLAGS) $(CONFIG_LFLAGS)
first all: $(BUILD_PATH)/bin/qmake$(EXEEXT)
qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT)
-
- $(BUILD_PATH)/bin/qmake$(EXEEXT): $(OBJS) $(QOBJS)
-- $(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS)
-+ $(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS) $(LDFLAGS)
-
- Makefile: $(SOURCE_PATH)/qmake/Makefile.unix
- @echo "Out of date, please rerun configure"
-@@ -284,6 +285,9 @@ qstring.o: $(SOURCE_PATH)/src/corelib/to
- qstring_compat.o: $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp
-
-+qstring_mac.o: $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm
-+ $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm
-+
- qstringbuilder.o: $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp
-
diff --git a/x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp b/x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp
index 2555884ed0d..936a85cf352 100644
--- a/x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp
+++ b/x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-qmake_generators_makefile.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
+$NetBSD: patch-qmake_generators_makefile.cpp,v 1.3 2018/01/17 19:30:47 markd Exp $
-* Libtoolized
+Pass library path to linker.
---- qmake/generators/makefile.cpp.orig 2015-06-29 20:03:22.000000000 +0000
+--- qmake/generators/makefile.cpp.orig 2016-06-10 06:48:56.000000000 +0000
+++ qmake/generators/makefile.cpp
-@@ -3256,7 +3256,7 @@ MakefileGenerator::writePkgConfigFile()
- pkgConfiglibName = "-framework " + bundle + " ";
+@@ -3297,7 +3297,7 @@ MakefileGenerator::writePkgConfigFile()
+ pkgConfiglibName = bundle.toQString();
} else {
if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir))
- t << "-L${libdir} ";
diff --git a/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp
deleted file mode 100644
index 91dcdba750e..00000000000
--- a/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-qmake_generators_unix_unixmake.cpp,v 1.3 2015/10/26 19:03:59 adam Exp $
-
-* fix install target so that destdir is added when installing QMAKE_TARGET
-
---- qmake/generators/unix/unixmake.cpp.orig 2015-06-29 20:03:23.000000000 +0000
-+++ qmake/generators/unix/unixmake.cpp
-@@ -326,27 +326,29 @@ UnixMakefileGenerator::init()
- if (!strncmp(libtoolify[i], "QMAKE_LINK", 10) || !strcmp(libtoolify[i], "QMAKE_AR_CMD")) {
- libtool_flags += " --mode=link";
- if(project->isActiveConfig("staticlib")) {
-- libtool_flags += " -static";
-+ comp_flags += " -static";
- } else {
- if(!project->isEmpty("QMAKE_LIB_FLAG")) {
-+ if(project->isActiveConfig("plugin"))
-+ comp_flags += " -avoid-version";
-+ else {
- int maj = project->first("VER_MAJ").toInt();
- int min = project->first("VER_MIN").toInt();
- int pat = project->first("VER_PAT").toInt();
-- comp_flags += " -version-info " + QString::number(10*maj + min) +
-- ":" + QString::number(pat) + ":0";
-+ comp_flags += " -version-info " + QString::number(maj + min) +
-+ ":" + QString::number(pat) +
-+ ":" + QString::number(min);
-+ }
- if (strcmp(libtoolify[i], "QMAKE_AR_CMD")) {
-- QString rpath = Option::output_dir;
-- if(!project->isEmpty("DESTDIR")) {
-- rpath = project->first("DESTDIR").toQString();
-- if(QDir::isRelativePath(rpath))
-- rpath.prepend(Option::output_dir + Option::dir_sep);
-- }
-+ QString rpath = Option::fixPathToTargetOS(project->first("target.path").toQString(), false);
-+ if(rpath.right(1) != Option::dir_sep)
-+ rpath += Option::dir_sep;
- comp_flags += " -rpath " + escapeFilePath(Option::fixPathToTargetOS(rpath, false));
- }
- }
- }
- if(project->isActiveConfig("plugin"))
-- libtool_flags += " -module";
-+ comp_flags += " -module";
- } else {
- libtool_flags += " --mode=compile";
- }
-@@ -705,7 +707,7 @@ UnixMakefileGenerator::defaultInstall(co
- QString ret, destdir = project->first("DESTDIR").toQString();
- if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
- destdir += Option::dir_sep;
-- QString targetdir = fileFixify(project->first("target.path").toQString(), FileFixifyAbsolute);
-+ QString targetdir = project->first("target.path").toQString();
- if(targetdir.right(1) != Option::dir_sep)
- targetdir += Option::dir_sep;
-
-@@ -745,10 +747,19 @@ UnixMakefileGenerator::defaultInstall(co
- QString src_targ = escapeFilePath(target);
- if(src_targ == "$(TARGET)")
- src_targ = "$(TARGETL)";
-- QString dst_dir = fileFixify(targetdir, FileFixifyAbsolute);
-+ QString dst_dir = targetdir;
- if(QDir::isRelativePath(dst_dir))
-- dst_dir = Option::fixPathToTargetOS(Option::output_dir + Option::dir_sep + dst_dir);
-- ret = "-$(LIBTOOL) --mode=install cp " + src_targ + ' ' + escapeFilePath(filePrefixRoot(root, dst_dir));
-+ dst_dir = Option::fixPathToTargetOS(dst_dir);
-+ dst_dir = Option::fixPathToTargetOS(dst_dir);
-+ if(!ret.isEmpty())
-+ ret += "\n\t";
-+ if(project->first("TEMPLATE") == "app") {
-+ ret += "-$(LIBTOOL) --mode=install cp \"" + Option::fixPathToTargetOS(destdir + src_targ, false) + "\" \"" + filePrefixRoot(root, dst_dir) + "\"";
-+ } else {
-+ ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\"";
-+ }
-+ if(!uninst.isEmpty())
-+ uninst.append("\n\t");
- uninst.append("-$(LIBTOOL) --mode=uninstall " + src_targ);
- } else {
- QString src_targ = target;
diff --git a/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp
index 8d365586300..17aa55c9493 100644
--- a/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp
+++ b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
+$NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.3 2018/01/17 19:30:47 markd Exp $
-* Libtoolized
+Append external variables.
---- qmake/generators/unix/unixmake2.cpp.orig 2015-06-29 20:03:23.000000000 +0000
+--- qmake/generators/unix/unixmake2.cpp.orig 2017-05-26 12:43:31.000000000 +0000
+++ qmake/generators/unix/unixmake2.cpp
-@@ -178,12 +178,12 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -169,12 +169,12 @@ UnixMakefileGenerator::writeMakeParts(QT
t << "####### Compiler, tools and options\n\n";
t << "CC = " << var("QMAKE_CC") << endl;
t << "CXX = " << var("QMAKE_CXX") << endl;
@@ -21,7 +21,7 @@ $NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 ada
{
QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
const ProStringList &incs = project->values("INCLUDEPATH");
-@@ -207,8 +207,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -198,8 +198,8 @@ UnixMakefileGenerator::writeMakeParts(QT
if(!project->isActiveConfig("staticlib")) {
t << "LINK = " << var("QMAKE_LINK") << endl;
@@ -32,26 +32,3 @@ $NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 ada
<< fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << endl;
}
-@@ -284,6 +284,8 @@ UnixMakefileGenerator::writeMakeParts(QT
- if(!project->isEmpty("QMAKE_BUNDLE")) {
- t << "TARGETD = " << fileVar("TARGET_x.y") << endl;
- t << "TARGET0 = " << fileVar("TARGET_") << endl;
-+ } else if(project->isActiveConfig("compile_libtool")) {
-+ t << "TARGETD = " << var("TARGET_la") << endl;
- } else if (!project->isActiveConfig("unversioned_libname")) {
- t << "TARGET0 = " << fileVar("TARGET_") << endl;
- if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
-@@ -1185,8 +1187,12 @@ void UnixMakefileGenerator::init2()
- } else if (project->isActiveConfig("staticlib")) {
- project->values("TARGET").first().prepend(project->first("QMAKE_PREFIX_STATICLIB"));
- project->values("TARGET").first() += "." + project->first("QMAKE_EXTENSION_STATICLIB");
-- if(project->values("QMAKE_AR_CMD").isEmpty())
-+ if(project->values("QMAKE_AR_CMD").isEmpty()) {
-+ if(project->isActiveConfig("compile_libtool"))
-+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)");
-+ else
- project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)");
-+ }
- } else {
- project->values("TARGETA").append(project->first("DESTDIR") + project->first("QMAKE_PREFIX_STATICLIB")
- + project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
diff --git a/x11/qt5-qtbase/patches/patch-qmake_qmake.pri b/x11/qt5-qtbase/patches/patch-qmake_qmake.pri
deleted file mode 100644
index 8df02cbace1..00000000000
--- a/x11/qt5-qtbase/patches/patch-qmake_qmake.pri
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-qmake_qmake.pri,v 1.1 2015/10/26 19:03:59 adam Exp $
-
-Fix building on Darwin.
-
---- qmake/qmake.pri.orig 2015-07-20 09:25:44.000000000 +0000
-+++ qmake/qmake.pri
-@@ -136,7 +136,7 @@ bootstrap { #Qt code
- SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp
- mac {
- SOURCES += qcore_mac.cpp qsettings_mac.cpp
-- OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm
-+ OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm qstring_mac.mm
- LIBS += -framework ApplicationServices -framework CoreServices -framework Foundation
- } else {
- SOURCES += qlocale_unix.cpp
diff --git a/x11/qt5-qtbase/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp b/x11/qt5-qtbase/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp
deleted file mode 100644
index 0c25f5eaf38..00000000000
--- a/x11/qt5-qtbase/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_concurrent_qtconcurrentiteratekernel.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
-
-Fix building on Darwin.
-
---- src/concurrent/qtconcurrentiteratekernel.cpp.orig 2013-11-27 01:01:16.000000000 +0000
-+++ src/concurrent/qtconcurrentiteratekernel.cpp
-@@ -41,7 +41,7 @@
-
- #include "qtconcurrentiteratekernel.h"
-
--#if defined(Q_OS_MAC)
-+#if defined(Q_OS_MAC) || defined(__APPLE__)
- #include <mach/mach.h>
- #include <mach/mach_time.h>
- #include <unistd.h>
-@@ -67,7 +67,7 @@ enum {
- MedianSize = 7
- };
-
--#if defined(Q_OS_MAC)
-+#if defined(Q_OS_MAC) || defined(__APPLE__)
-
- static qint64 getticks()
- {
diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_arch_sparc_arch.pri b/x11/qt5-qtbase/patches/patch-src_corelib_arch_sparc_arch.pri
deleted file mode 100644
index bd07d43278b..00000000000
--- a/x11/qt5-qtbase/patches/patch-src_corelib_arch_sparc_arch.pri
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_corelib_arch_sparc_arch.pri,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-* Fix for SPARC64
-
---- src/corelib/arch/sparc/arch.pri.orig 2013-11-27 01:01:15.000000000 +0000
-+++ src/corelib/arch/sparc/arch.pri
-@@ -1,7 +1,7 @@
- #
- # SPARC architecture
- #
--*-64* {
-+sEqual(QT_HOST_BITSIZE, 64) | *-64* {
- SOURCES += $$PWD/qatomic64.s
- }
- else {
diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp
index d0277e18e52..1335cefb911 100644
--- a/x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp
+++ b/x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
+$NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.2 2018/01/17 19:30:47 markd Exp $
* Add DragonFly support
* Add NetBSD support
---- src/corelib/codecs/qiconvcodec.cpp.orig 2013-11-27 01:01:15.000000000 +0000
+--- src/corelib/codecs/qiconvcodec.cpp.orig 2017-01-18 14:20:58.000000000 +0000
+++ src/corelib/codecs/qiconvcodec.cpp
-@@ -52,9 +52,14 @@
+@@ -52,9 +52,14 @@ QT_REQUIRE_CONFIG(iconv);
#include <stdio.h>
#include <dlfcn.h>
@@ -21,7 +21,7 @@ $NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.1 2014/12/30 17:23:46 adam
# include <langinfo.h>
#endif
-@@ -71,6 +76,9 @@
+@@ -71,6 +76,9 @@ QT_REQUIRE_CONFIG(iconv);
# else
# define UTF16 "UTF-16LE"
# endif
@@ -31,34 +31,7 @@ $NetBSD: patch-src_corelib_codecs_qiconvcodec.cpp,v 1.1 2014/12/30 17:23:46 adam
#else
# define UTF16 "UTF-16"
#endif
-@@ -223,7 +231,7 @@ QString QIconvCodec::convertToUnicode(co
- IconvState *state = *pstate;
- size_t inBytesLeft = len;
- // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
--#ifdef GNU_LIBICONV
-+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
- // GNU doesn't disagree with POSIX :/
- const char *inBytes = chars;
- #else
-@@ -322,7 +330,7 @@ static bool setByteOrder(iconv_t cd)
- size_t outBytesLeft = sizeof buf;
- size_t inBytesLeft = sizeof bom;
-
--#if defined(GNU_LIBICONV)
-+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
- const char **inBytesPtr = const_cast<const char **>(&inBytes);
- #else
- char **inBytesPtr = &inBytes;
-@@ -342,7 +350,7 @@ QByteArray QIconvCodec::convertFromUnico
- char *outBytes;
- size_t inBytesLeft;
-
--#if defined(GNU_LIBICONV)
-+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
- const char **inBytesPtr = const_cast<const char **>(&inBytes);
- #else
- char **inBytesPtr = &inBytes;
-@@ -482,11 +490,13 @@ iconv_t QIconvCodec::createIconv_t(const
+@@ -444,11 +452,13 @@ iconv_t QIconvCodec::createIconv_t(const
#endif
const char *codeset = empty_codeset;
cd = iconv_open(to ? to : codeset, from ? from : codeset);
diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_global_qsystemdetection.h b/x11/qt5-qtbase/patches/patch-src_corelib_global_qsystemdetection.h
deleted file mode 100644
index 36d2bbf4fde..00000000000
--- a/x11/qt5-qtbase/patches/patch-src_corelib_global_qsystemdetection.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_corelib_global_qsystemdetection.h,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-* Add Interix support
-
---- src/corelib/global/qsystemdetection.h.orig 2013-11-27 01:01:15.000000000 +0000
-+++ src/corelib/global/qsystemdetection.h
-@@ -68,6 +68,7 @@
- NETBSD - NetBSD
- OPENBSD - OpenBSD
- BSDI - BSD/OS
-+ INTERIX - Interix
- IRIX - SGI Irix
- OSF - HP Tru64 UNIX
- SCO - SCO OpenServer 5
-@@ -151,6 +152,9 @@
- #elif defined(__bsdi__)
- # define Q_OS_BSDI
- # define Q_OS_BSD4
-+#elif defined(__INTERIX)
-+# define Q_OS_INTERIX
-+# define Q_OS_BSD4
- #elif defined(__sgi)
- # define Q_OS_IRIX
- #elif defined(__osf__)
diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri b/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri
index 64eb9e50448..0c7c3531e7c 100644
--- a/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri
+++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri
@@ -1,18 +1,18 @@
-$NetBSD: patch-src_corelib_io_io.pri,v 1.4 2015/10/26 19:03:59 adam Exp $
+$NetBSD: patch-src_corelib_io_io.pri,v 1.5 2018/01/17 19:30:47 markd Exp $
* Add DragonFly support
* Patch sent and merged upstream:
http://codereview.qt-project.org/#/c/111741/
* fix linux test.
---- src/corelib/io/io.pri.orig 2014-12-05 16:24:37.000000000 +0000
+--- src/corelib/io/io.pri.orig 2017-01-18 14:20:58.000000000 +0000
+++ src/corelib/io/io.pri
-@@ -172,13 +172,13 @@ win32 {
+@@ -169,13 +169,13 @@ win32 {
io/qstorageinfo_unix.cpp
}
-- linux|if(qnx:contains(QT_CONFIG, inotify)) {
-+ linux*|if(qnx:contains(QT_CONFIG, inotify)) {
+- linux|if(qnx:qtConfig(inotify)) {
++ linux*|if(qnx:qtConfig(inotify)) {
SOURCES += io/qfilesystemwatcher_inotify.cpp
HEADERS += io/qfilesystemwatcher_inotify_p.h
}
diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_qlockfile__unix.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_io_qlockfile__unix.cpp
deleted file mode 100644
index b15d4c9d1dd..00000000000
--- a/x11/qt5-qtbase/patches/patch-src_corelib_io_qlockfile__unix.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-src_corelib_io_qlockfile__unix.cpp,v 1.2 2016/12/04 21:46:54 marino Exp $
-
-Add support for NetBSD and OpenBSD.
-Enable fallback to unsupported for DragonFly
-
---- src/corelib/io/qlockfile_unix.cpp.orig 2015-10-13 04:35:31 UTC
-+++ src/corelib/io/qlockfile_unix.cpp
-@@ -54,6 +54,10 @@
- #elif defined(Q_OS_LINUX)
- # include <unistd.h>
- # include <cstdio>
-+#elif defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
-+# include <kvm.h>
-+# include <sys/param.h>
-+# include <sys/sysctl.h>
- #elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS)
- # include <sys/user.h>
- # if defined(__GLIBC__) && defined(__FreeBSD_kernel__)
-@@ -239,7 +243,20 @@ QString QLockFilePrivate::processNameByP
- }
- buf[len] = 0;
- return QFileInfo(QFile::decodeName(buf)).fileName();
--#elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS)
-+#elif defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
-+ kvm_t *kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
-+ int cnt;
-+ QString name;
-+ struct kinfo_proc2 *proc = kvm_getproc2(kd, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc2), &cnt);
-+ if (!proc) {
-+ name = QString();
-+ }
-+ else {
-+ name = QFile::decodeName(proc->p_comm);
-+ }
-+ kvm_close(kd);
-+ return name;
-+#elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS) && !defined(__DragonFly__)
- # if defined(__GLIBC__) && defined(__FreeBSD_kernel__)
- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid };
- size_t len = 0;
diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
index 1a33fcbfa24..168084935f7 100644
--- a/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
+++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
@@ -1,31 +1,9 @@
-$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.6 2016/12/04 21:46:54 marino Exp $
+$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.7 2018/01/17 19:30:47 markd Exp $
-* make statvfs available on non-NetBSD BSD platforms
-* Use f_bsize instead of f_frsize on non-NetBSD BSD platforms
* fix build on SunOS
--- src/corelib/io/qstorageinfo_unix.cpp.orig 2015-10-13 04:35:31 UTC
+++ src/corelib/io/qstorageinfo_unix.cpp
-@@ -68,8 +68,8 @@
-
- #if defined(Q_OS_BSD4)
- # if defined(Q_OS_NETBSD)
-- define QT_STATFSBUF struct statvfs
-- define QT_STATFS ::statvfs
-+# define QT_STATFSBUF struct statvfs
-+# define QT_STATFS ::statvfs
- # else
- # define QT_STATFSBUF struct statfs
- # define QT_STATFS ::statfs
-@@ -78,7 +78,7 @@
- # if !defined(ST_RDONLY)
- # define ST_RDONLY MNT_RDONLY
- # endif
--# if !defined(_STATFS_F_FLAGS)
-+# if !defined(_STATFS_F_FLAGS) && !defined(Q_OS_NETBSD)
- # define _STATFS_F_FLAGS 1
- # endif
- #elif defined(Q_OS_ANDROID)
@@ -87,7 +87,7 @@
# if !defined(ST_RDONLY)
# define ST_RDONLY 1 // hack for missing define on Android
@@ -35,19 +13,3 @@ $NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.6 2016/12/04 21:46:54 ma
# define QT_STATFSBUF struct statvfs
# define QT_STATFS ::statvfs
#else
-@@ -506,9 +506,15 @@ void QStorageInfoPrivate::retrieveVolume
- valid = true;
- ready = true;
-
-+#if defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD)
-+ bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize;
-+ bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize;
-+ bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize;
-+#else
- bytesTotal = statfs_buf.f_blocks * statfs_buf.f_frsize;
- bytesFree = statfs_buf.f_bfree * statfs_buf.f_frsize;
- bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize;
-+#endif
- #if defined(Q_OS_ANDROID) || defined (Q_OS_BSD4)
- #if defined(_STATFS_F_FLAGS)
- readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0;
diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp
index d470269d794..6efe08da3a0 100644
--- a/x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp
+++ b/x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp
@@ -1,11 +1,10 @@
-$NetBSD: patch-src_corelib_thread_qwaitcondition__unix.cpp,v 1.1 2017/04/24 12:27:58 maya Exp $
+$NetBSD: patch-src_corelib_thread_qwaitcondition__unix.cpp,v 1.2 2018/01/17 19:30:47 markd Exp $
-don't have pthread_condattr_setclock on NetBSD < 6.1, don't
-use it.
+On NetBSD before 6.1, do not use pthread_condattr_setclock().
---- src/corelib/thread/qwaitcondition_unix.cpp.orig 2015-10-13 04:35:30.000000000 +0000
+--- src/corelib/thread/qwaitcondition_unix.cpp.orig 2017-05-26 12:43:31.000000000 +0000
+++ src/corelib/thread/qwaitcondition_unix.cpp
-@@ -45,6 +45,7 @@
+@@ -52,6 +52,7 @@
#include <errno.h>
#include <sys/time.h>
@@ -13,15 +12,12 @@ use it.
#include <time.h>
#ifndef QT_NO_THREAD
-@@ -77,7 +78,10 @@ void qt_initialize_pthread_cond(pthread_
+@@ -84,7 +85,7 @@ void qt_initialize_pthread_cond(pthread_
#if defined(Q_OS_ANDROID)
if (local_condattr_setclock && QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock)
local_condattr_setclock(&condattr, CLOCK_MONOTONIC);
--#elif !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
-+#elif (defined(Q_OS_NETBSD) && (__NetBSD_Version__ < 600010000)) || \
-+ defined(Q_OS_MAC) || defined(Q_OS_HAIKU)
-+ /* nothing, don't have pthread_condattr_setclock */
-+#else
+-#elif !defined(Q_OS_MAC)
++#elif !defined(Q_OS_MAC) && !(defined(Q_OS_NETBSD) && (__NetBSD_Version__ < 600010000))
if (QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock)
pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC);
#endif
diff --git a/x11/qt5-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp b/x11/qt5-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp
index 890ce83cdd9..bac30487552 100644
--- a/x11/qt5-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp
+++ b/x11/qt5-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_network_kernel_qhostinfo__unix.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
+$NetBSD: patch-src_network_kernel_qhostinfo__unix.cpp,v 1.2 2018/01/17 19:30:47 markd Exp $
---- src/network/kernel/qhostinfo_unix.cpp.orig 2013-11-27 01:01:10.000000000 +0000
+--- src/network/kernel/qhostinfo_unix.cpp.orig 2016-06-10 06:48:56.000000000 +0000
+++ src/network/kernel/qhostinfo_unix.cpp
-@@ -126,6 +126,8 @@ static void resolveLibrary()
+@@ -123,6 +123,8 @@ static bool resolveLibraryInternal()
if (!local_res_nclose)
local_res_ninit = 0;
}
+ if (local_res_ninit)
+ local_res_init = 0;
#endif
- }
+ return true;
diff --git a/x11/qt5-qtbase/patches/patch-src_openglextensions_openglextensions.pro b/x11/qt5-qtbase/patches/patch-src_openglextensions_openglextensions.pro
index a8a3e5c2b44..21b9d4bfede 100644
--- a/x11/qt5-qtbase/patches/patch-src_openglextensions_openglextensions.pro
+++ b/x11/qt5-qtbase/patches/patch-src_openglextensions_openglextensions.pro
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_openglextensions_openglextensions.pro,v 1.1 2015/10/26 19:03:59 adam Exp $
+$NetBSD: patch-src_openglextensions_openglextensions.pro,v 1.2 2018/01/17 19:30:47 markd Exp $
Build shared library.
---- src/openglextensions/openglextensions.pro.orig 2015-10-26 11:22:39.000000000 +0000
+--- src/openglextensions/openglextensions.pro.orig 2017-01-18 14:20:58.000000000 +0000
+++ src/openglextensions/openglextensions.pro
@@ -1,5 +1,4 @@
TARGET = QtOpenGLExtensions
-CONFIG += static
- contains(QT_CONFIG, opengl):CONFIG += opengl
- contains(QT_CONFIG, opengles2):CONFIG += opengles2
+ qtConfig(opengl): CONFIG += opengl
+ qtConfig(opengles2): CONFIG += opengles2
diff --git a/x11/qt5-qtbase/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri b/x11/qt5-qtbase/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri
deleted file mode 100644
index 222962c8d36..00000000000
--- a/x11/qt5-qtbase/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_platformsupport_devicediscovery_devicediscovery.pri,v 1.1 2015/10/26 19:03:59 adam Exp $
-
-Add missing header; required when libQt5PlatformSupport is a shared library.
-
---- src/platformsupport/devicediscovery/devicediscovery.pri.orig 2015-10-25 19:25:35.000000000 +0000
-+++ src/platformsupport/devicediscovery/devicediscovery.pri
-@@ -15,4 +15,5 @@ linux {
- }
- } else {
- SOURCES += $$PWD/qdevicediscovery_dummy.cpp
-+ HEADERS += $$PWD/qdevicediscovery_dummy_p.h
- }
diff --git a/x11/qt5-qtbase/patches/patch-src_platformsupport_platformsupport.pro b/x11/qt5-qtbase/patches/patch-src_platformsupport_platformsupport.pro
deleted file mode 100644
index a1d97e93d17..00000000000
--- a/x11/qt5-qtbase/patches/patch-src_platformsupport_platformsupport.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_platformsupport_platformsupport.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-* Libtoolized and make it shared library
-
---- src/platformsupport/platformsupport.pro.orig 2013-11-27 01:01:11.000000000 +0000
-+++ src/platformsupport/platformsupport.pro
-@@ -1,7 +1,7 @@
- TARGET = QtPlatformSupport
- QT = core-private gui-private
-
--CONFIG += static internal_module
-+CONFIG += internal_module
- mac:LIBS_PRIVATE += -lz
-
- DEFINES += QT_NO_CAST_FROM_ASCII
diff --git a/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro b/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro
index 5578fe1c8c8..8cbe81ba08a 100644
--- a/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro
+++ b/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_plugins_platforminputcontexts_compose_compose.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
+$NetBSD: patch-src_plugins_platforminputcontexts_compose_compose.pro,v 1.2 2018/01/17 19:30:47 markd Exp $
PR pkg/48553
---- src/plugins/platforminputcontexts/compose/compose.pro.orig 2014-09-11 10:48:06.000000000 +0000
+--- src/plugins/platforminputcontexts/compose/compose.pro.orig 2017-05-26 12:43:31.000000000 +0000
+++ src/plugins/platforminputcontexts/compose/compose.pro
-@@ -16,6 +16,8 @@ SOURCES += $$PWD/main.cpp \
+@@ -9,6 +9,8 @@ SOURCES += $$PWD/qcomposeplatforminputco
HEADERS += $$PWD/qcomposeplatforminputcontext.h \
$$PWD/generator/qtablegenerator.h \
+DEFINES += X11BASE=\\\"$$(X11BASE)\\\"
+
# libxkbcommon
- contains(QT_CONFIG, xkbcommon-qt): {
- # dont't need x11 dependency for compose key plugin
+ !qtConfig(xkbcommon-system) {
+ include(../../../3rdparty/xkbcommon.pri)
diff --git a/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp b/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp
index 3030a4ec883..f865954a5f2 100644
--- a/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp
+++ b/x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
+$NetBSD: patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp,v 1.2 2018/01/17 19:30:47 markd Exp $
PR pkg/48553
---- src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp.orig 2014-09-11 10:48:06.000000000 +0000
+--- src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp.orig 2017-05-26 12:43:31.000000000 +0000
+++ src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -76,6 +76,10 @@ void TableGenerator::initPossibleLocatio
- // the QTCOMPOSE environment variable
+@@ -265,6 +265,10 @@ void TableGenerator::initPossibleLocatio
+ m_possibleLocations.reserve(7);
if (qEnvironmentVariableIsSet("QTCOMPOSE"))
m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
+#ifdef X11BASE
diff --git a/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.h b/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.h
deleted file mode 100644
index 28566fb7d76..00000000000
--- a/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_plugins_platforms_cocoa_qcocoahelpers.h,v 1.1 2017/11/13 17:36:11 minskim Exp $
-
-Fix build error with macOS 10.13 SDK
-https://bugreports.qt.io/browse/QTBUG-63401
-
---- src/plugins/platforms/cocoa/qcocoahelpers.h.orig 2015-10-13 04:35:27.000000000 +0000
-+++ src/plugins/platforms/cocoa/qcocoahelpers.h
-@@ -78,7 +78,7 @@ QColor qt_mac_toQColor(CGColorRef color)
- // Creates a mutable shape, it's the caller's responsibility to release.
- HIMutableShapeRef qt_mac_QRegionToHIMutableShape(const QRegion &region);
-
--OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage);
-+void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage);
-
- QChar qt_mac_qtKey2CocoaKey(Qt::Key key);
- Qt::Key qt_mac_cocoaKey2QtKey(QChar keyCode);
diff --git a/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.mm b/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.mm
deleted file mode 100644
index 613821c87ff..00000000000
--- a/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.mm
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-src_plugins_platforms_cocoa_qcocoahelpers.mm,v 1.1 2017/11/13 17:36:11 minskim Exp $
-
-Fix build error with macOS 10.13 SDK
-https://bugreports.qt.io/browse/QTBUG-63401
-
---- src/plugins/platforms/cocoa/qcocoahelpers.mm.orig 2015-10-13 04:35:27.000000000 +0000
-+++ src/plugins/platforms/cocoa/qcocoahelpers.mm
-@@ -668,15 +668,8 @@ NSRect qt_mac_flipRect(const QRect &rect
- return NSMakeRect(rect.x(), flippedY, rect.width(), rect.height());
- }
-
--OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage)
-+void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage)
- {
-- // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev)
-- OSStatus err = noErr;
--
-- require_action(inContext != NULL, InvalidContext, err = paramErr);
-- require_action(inBounds != NULL, InvalidBounds, err = paramErr);
-- require_action(inImage != NULL, InvalidImage, err = paramErr);
--
- CGContextSaveGState( inContext );
- CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds));
- CGContextScaleCTM(inContext, 1, -1);
-@@ -684,10 +677,6 @@ OSStatus qt_mac_drawCGImage(CGContextRef
- CGContextDrawImage(inContext, *inBounds, inImage);
-
- CGContextRestoreGState(inContext);
--InvalidImage:
--InvalidBounds:
--InvalidContext:
-- return err;
- }
-
- Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum)
diff --git a/x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro b/x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro
deleted file mode 100644
index 36c2f5ef144..00000000000
--- a/x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_tools_bootstrap_bootstrap.pro,v 1.2 2015/10/26 19:03:59 adam Exp $
-
-* Create shared library .so file libQt5Bootstrap.la.
-
---- src/tools/bootstrap/bootstrap.pro.orig 2015-07-27 10:28:43.000000000 +0000
-+++ src/tools/bootstrap/bootstrap.pro
-@@ -1,4 +1,4 @@
--option(host_build)
-+#option(host_build)
-
- TARGET = QtBootstrap
- QT =
diff --git a/x11/qt5-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro b/x11/qt5-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro
index a961adb5c24..fd1b74fd5e4 100644
--- a/x11/qt5-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro
+++ b/x11/qt5-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro
@@ -1,8 +1,8 @@
-$NetBSD: patch-tests_auto_corelib_io_qprocess_qprocess.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
+$NetBSD: patch-tests_auto_corelib_io_qprocess_qprocess.pro,v 1.2 2018/01/17 19:30:47 markd Exp $
* Pass whitespace(s) in filename test cases.
---- tests/auto/corelib/io/qprocess/qprocess.pro.orig 2014-02-01 20:37:28.000000000 +0000
+--- tests/auto/corelib/io/qprocess/qprocess.pro.orig 2017-01-18 14:20:58.000000000 +0000
+++ tests/auto/corelib/io/qprocess/qprocess.pro
@@ -3,10 +3,7 @@ TEMPLATE = subdirs
include(qprocess.pri)
@@ -14,5 +14,5 @@ $NetBSD: patch-tests_auto_corelib_io_qprocess_qprocess.pro,v 1.1 2014/12/30 17:2
- testSpaceInName
+SUBDIRS += testProcessSpacesArgs/nospace.pro
- win32:!wince* {
+ win32 {
SUBDIRS += \
diff --git a/x11/qt5-qtdeclarative/Makefile b/x11/qt5-qtdeclarative/Makefile
index 7106c7a2d03..1151b37f52d 100644
--- a/x11/qt5-qtdeclarative/Makefile
+++ b/x11/qt5-qtdeclarative/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: Makefile,v 1.24 2018/01/17 19:30:47 markd Exp $
-DISTNAME= qtdeclarative-opensource-src-${QTVERSION}
+DISTNAME= qtdeclarative-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtdeclarative-${QTVERSION}
-PKGREVISION= 9
COMMENT= Qt5 module for declarative framework
BUILD_TARGET= sub-tools
diff --git a/x11/qt5-qtdeclarative/PLIST b/x11/qt5-qtdeclarative/PLIST
index a14b1e35f0b..fef355e4ba9 100644
--- a/x11/qt5-qtdeclarative/PLIST
+++ b/x11/qt5-qtdeclarative/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2015/10/26 19:03:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/01/17 19:30:47 markd Exp $
lib/pkgconfig/Qt5Qml.pc
lib/pkgconfig/Qt5QmlDevTools.pc
lib/pkgconfig/Qt5Quick.pc
lib/pkgconfig/Qt5QuickParticles.pc
lib/pkgconfig/Qt5QuickTest.pc
qt5/bin/qml
+qt5/bin/qmlcachegen
qt5/bin/qmleasing
qt5/bin/qmlimportscanner
qt5/bin/qmllint
@@ -13,18 +14,22 @@ qt5/bin/qmlplugindump
qt5/bin/qmlprofiler
qt5/bin/qmlscene
qt5/bin/qmltestrunner
+qt5/include/QtPacketProtocol/${PKGVERSION}/QtPacketProtocol/private/qpacket_p.h
+qt5/include/QtPacketProtocol/${PKGVERSION}/QtPacketProtocol/private/qpacketprotocol_p.h
+qt5/include/QtPacketProtocol/QtPacketProtocol
+qt5/include/QtPacketProtocol/QtPacketProtocolDepends
+qt5/include/QtPacketProtocol/QtPacketProtocolVersion
+qt5/include/QtPacketProtocol/qtpacketprotocolversion.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qabstractanimationjob_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qanimationgroupjob_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qanimationjobutil_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qbitfield_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qcontinuinganimationgroupjob_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qdebugmessageservice_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qdeletewatcher_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qdeferredcleanup_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qfieldlist_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qfinitestack_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qflagpointer_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qhashedstring_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qhashfield_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qintrusivelist_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qjsengine_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qjsvalue_p.h
@@ -33,11 +38,8 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qlazilyallocated_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qparallelanimationgroupjob_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qpauseanimationjob_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qpodvector_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qpointervaluepair_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlabstractbinding_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlabstractexpression_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlabstractprofileradapter_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlaccessors_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmladaptormodel_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlapplicationengine_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlbind_p.h
@@ -47,27 +49,23 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlboundsignalexpressionpointer_p
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlbuiltinfunctions_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlchangeset_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcleanup_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcompiler_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcomponent_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcomponentattached_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlconfigurabledebugservice_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlconfigurabledebugservice_p_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlconnections_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcontext_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcontextwrapper_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcustomparser_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldata_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugserver_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugserverconnection_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugconnector_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugpluginmanager_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugservice_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugservice_p_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugservicefactory_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugserviceinterfaces_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugstatesdelegate_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldelayedcallqueue_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldelegatemodel_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldelegatemodel_p_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldirparser_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlengine_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlenginecontrolservice_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlenginedebugservice_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlexpression_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlextensionplugin_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlfileselector_p.h
@@ -75,8 +73,6 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlglobal_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlguard_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlimport_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlincubator_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinspectorinterface_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinspectorservice_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinstantiator_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinstantiator_p_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlirbuilder_p.h
@@ -99,6 +95,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmllistmodel_p_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmllistmodelworkeragent_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmllistwrapper_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmllocale_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlloggingcategory_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlmemoryprofiler_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlmetatype_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlmodelindexvaluetype_p.h
@@ -109,12 +106,13 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlobjectcreator_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlobjectmodel_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlopenmetaobject_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlplatform_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpool_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlprofiler_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlprofilerdefinitions_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlprofilerservice_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlproperty_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertycache_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertycachecreator_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertyindex_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertyvalidator_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertyvalueinterceptor_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlproxymetaobject_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlrefcount_p.h
@@ -132,13 +130,13 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlvaluetypeproxybinding_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlvaluetypewrapper_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlvme_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlvmemetaobject_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlwatcher_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlxmlhttprequest_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qquickpackage_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qquickworkerscript_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qrecursionwatcher_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qrecyclepool_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qsequentialanimationgroupjob_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qtqml-config_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qtqmlglobal_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4alloca_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4argumentsobject_p.h
@@ -149,21 +147,23 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4assembler_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4binop_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4booleanobject_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4codegen_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4compilationunitmapper_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4compileddata_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4compiler_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4context_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4dataview_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4dateobject_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4debugging_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4debugservice_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4domerrors_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4engine_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4enginebase_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4errorobject_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4executableallocator_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4function_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4functionobject_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4global_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4globalobject_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4heap_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4identifier_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4identifiertable_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4include_p.h
@@ -175,27 +175,29 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4isel_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4isel_util_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4jsir_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4jsonobject_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4jssimplifier_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4lookup_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4managed_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4math_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4mathobject_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4memberdata_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4mm_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4mmdefs_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4numberobject_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4object_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4objectiterator_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4objectproto_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4persistent_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4profileradapter_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4profiling_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4property_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4qmlextensions_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4qmlcontext_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4qobjectwrapper_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4regalloc_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4regexp_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4regexpobject_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4registerinfo_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4runtime_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4runtimeapi_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4scopedvalue_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4script_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4sequenceobject_p.h
@@ -209,10 +211,10 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4targetplatform_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4typedarray_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4unop_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4util_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4value_inl_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4value_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4variantobject_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4vme_moth_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4writebarrier_p.h
qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv8engine_p.h
qt5/include/QtQml/QJSEngine
qt5/include/QtQml/QJSValue
@@ -275,107 +277,24 @@ qt5/include/QtQml/qqmlproperty.h
qt5/include/QtQml/qqmlpropertymap.h
qt5/include/QtQml/qqmlpropertyvaluesource.h
qt5/include/QtQml/qqmlscriptstring.h
+qt5/include/QtQml/qtqml-config.h
qt5/include/QtQml/qtqmlglobal.h
qt5/include/QtQml/qtqmlversion.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qbitfield_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qdeletewatcher_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qfieldlist_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qfinitestack_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qflagpointer_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qhashedstring_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qhashfield_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qintrusivelist_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qlazilyallocated_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qpodvector_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qpointervaluepair_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlirbuilder_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsast_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsastfwd_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsastvisitor_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsengine_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsglobal_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsgrammar_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljskeywords_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljslexer_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsmemorypool_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsparser_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlnullablevalue_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlpool_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlrefcount_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlthread_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmltypecompiler_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qrecursionwatcher_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qrecyclepool_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qtqmldevtoolsglobal_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4alloca_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4argumentsobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4arraybuffer_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4arraydata_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4arrayobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4booleanobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4codegen_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4compileddata_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4compiler_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4context_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4dataview_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4dateobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4debugging_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4engine_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4errorobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4executableallocator_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4function_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4functionobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4global_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4globalobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4identifier_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4identifiertable_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4include_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4instr_moth_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4internalclass_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4isel_moth_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4isel_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4isel_util_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4jsir_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4jsonobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4lookup_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4managed_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4math_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4mathobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4memberdata_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4mm_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4numberobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4object_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4objectiterator_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4objectproto_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4persistent_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4profiling_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4property_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4qmlextensions_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4qobjectwrapper_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4regexp_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4regexpobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4runtime_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4scopedvalue_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4script_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4sequenceobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4serialize_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4sparsearray_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4ssa_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4string_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4stringobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4typedarray_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4util_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4value_inl_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4value_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4variantobject_p.h
-qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4vme_moth_p.h
-qt5/include/QtQmlDevTools/QtQmlDevTools
-qt5/include/QtQmlDevTools/QtQmlDevToolsDepends
-qt5/include/QtQmlDevTools/QtQmlDevToolsVersion
-qt5/include/QtQmlDevTools/qtqmldevtoolsversion.h
-qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/designerwindowmanager_p.h
+qt5/include/QtQmlDebug/${PKGVERSION}/QtQmlDebug/private/qqmldebugclient_p.h
+qt5/include/QtQmlDebug/${PKGVERSION}/QtQmlDebug/private/qqmldebugclient_p_p.h
+qt5/include/QtQmlDebug/${PKGVERSION}/QtQmlDebug/private/qqmldebugconnection_p.h
+qt5/include/QtQmlDebug/${PKGVERSION}/QtQmlDebug/private/qqmlenginecontrolclient_p.h
+qt5/include/QtQmlDebug/${PKGVERSION}/QtQmlDebug/private/qqmlenginecontrolclient_p_p.h
+qt5/include/QtQmlDebug/${PKGVERSION}/QtQmlDebug/private/qqmleventlocation_p.h
+qt5/include/QtQmlDebug/${PKGVERSION}/QtQmlDebug/private/qqmlprofilerclient_p.h
+qt5/include/QtQmlDebug/${PKGVERSION}/QtQmlDebug/private/qqmlprofilerclient_p_p.h
+qt5/include/QtQmlDebug/QtQmlDebug
+qt5/include/QtQmlDebug/QtQmlDebugDepends
+qt5/include/QtQmlDebug/QtQmlDebugVersion
+qt5/include/QtQmlDebug/qtqmldebugversion.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qaccessiblequickitem_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qaccessiblequickview_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qqmldesignermetaobject_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickaccessibleattached_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickaccessiblefactory_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanchors_p.h
@@ -383,6 +302,7 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanchors_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanimatedimage_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanimatedimage_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanimatedsprite_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanimatedsprite_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanimation_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanimation_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanimationcontroller_p.h
@@ -401,7 +321,17 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickcontext2d_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickcontext2dcommandbuffer_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickcontext2dtexture_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickcontext2dtile_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdesignercustomobjectdata_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdesignercustomparserobject_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdesignersupport_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdesignersupportitems_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdesignersupportmetainfo_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdesignersupportproperties_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdesignersupportpropertychanges_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdesignersupportstates_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdesignerwindowmanager_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdrag_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdraghandler_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdroparea_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickevents_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickflickable_p.h
@@ -411,7 +341,10 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickflipable_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfocusscope_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfontloader_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfontmetrics_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickgenericshadereffect_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickgraphicsinfo_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickgridview_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickhandlersmodule_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickimage_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickimage_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickimagebase_p.h
@@ -431,8 +364,11 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickloader_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickloader_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickmousearea_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickmousearea_p_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickmultipointhandler_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickmultipointtoucharea_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickopenglinfo_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickopenglshadereffect_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickopenglshadereffectnode_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpainteditem_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpath_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpath_p_p.h
@@ -441,7 +377,11 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpathview_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpathview_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpincharea_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpincharea_p_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpinchhandler_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpixmapcache_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpointerdevicehandler_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpointerhandler_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpointhandler_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpositioners_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpositioners_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickprofiler_p.h
@@ -455,15 +395,16 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickscalegrid_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickscreen_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffect_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffectmesh_p.h
-qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffectnode_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffectsource_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshortcut_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicksinglepointhandler_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicksmoothedanimation_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicksmoothedanimation_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickspringanimation_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicksprite_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickspriteengine_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickspritesequence_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickspritesequence_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickstate_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickstate_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickstatechangescript_p.h
@@ -472,10 +413,12 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickstateoperations_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickstyledtext_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicksvgparser_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicksystempalette_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktaphandler_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktext_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktext_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextcontrol_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextcontrol_p_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextdocument_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextedit_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextedit_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextinput_p.h
@@ -489,47 +432,78 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktransition_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktransitionmanager_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktranslate_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickutilmodule_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickvalidator_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickvaluetypes_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickview_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickwindow_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickwindowattached_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickwindowmodule_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgabstractrenderer_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgabstractsoftwarerenderer_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgadaptationlayer_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgareaallocator_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgatlastexture_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgbasicglyphnode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgbasicinternalimagenode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgbasicinternalrectanglenode_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgbatchrenderer_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgcontext_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgcontextplugin_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultcontext_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultdistancefieldglyphcache_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultglyphnode_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultglyphnode_p_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultimagenode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultinternalimagenode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultinternalrectanglenode_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultlayer_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultninepatchnode_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultpainternode_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultrectanglenode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultrendercontext_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultspritenode_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdepthstencilbuffer_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdistancefieldglyphnode_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdistancefieldglyphnode_p_p.h
-qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdistancefieldutil_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgengine_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsggeometry_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgmaterialshader_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgnode_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgnodeupdater_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgpkmhandler_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgrenderer_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgrenderloop_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgrendernode_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgshadersourcebuilder_p.h
-qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgshareddistancefieldglyphcache_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwareadaptation_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarecontext_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwareglyphnode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwareinternalimagenode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwareinternalrectanglenode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarelayer_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarepainternode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarepixmaprenderer_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarepixmaptexture_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarepublicnodes_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarerenderablenode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarerenderablenodeupdater_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarerenderer_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarerenderlistbuilder_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarerenderloop_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarespritenode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgsoftwarethreadedrenderloop_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgtexture_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgtexturematerial_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgtexturereader_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgthreadedrenderloop_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgwindowsrenderloop_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qtquick-config_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qtquick2_p.h
qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qtquickglobal_p.h
+qt5/include/QtQuick/QQuickAsyncImageProvider
qt5/include/QtQuick/QQuickFramebufferObject
qt5/include/QtQuick/QQuickImageProvider
+qt5/include/QtQuick/QQuickImageResponse
qt5/include/QtQuick/QQuickItem
qt5/include/QtQuick/QQuickItemGrabResult
qt5/include/QtQuick/QQuickPaintedItem
@@ -547,13 +521,18 @@ qt5/include/QtQuick/QSGEngine
qt5/include/QtQuick/QSGFlatColorMaterial
qt5/include/QtQuick/QSGGeometry
qt5/include/QtQuick/QSGGeometryNode
+qt5/include/QtQuick/QSGImageNode
qt5/include/QtQuick/QSGMaterial
qt5/include/QtQuick/QSGMaterialShader
qt5/include/QtQuick/QSGMaterialType
+qt5/include/QtQuick/QSGNinePatchNode
qt5/include/QtQuick/QSGNode
qt5/include/QtQuick/QSGNodeVisitor
qt5/include/QtQuick/QSGOpacityNode
qt5/include/QtQuick/QSGOpaqueTextureMaterial
+qt5/include/QtQuick/QSGRectangleNode
+qt5/include/QtQuick/QSGRenderNode
+qt5/include/QtQuick/QSGRendererInterface
qt5/include/QtQuick/QSGRootNode
qt5/include/QtQuick/QSGSimpleMaterial
qt5/include/QtQuick/QSGSimpleMaterialComparableMaterial
@@ -568,7 +547,6 @@ qt5/include/QtQuick/QSGVertexColorMaterial
qt5/include/QtQuick/QtQuick
qt5/include/QtQuick/QtQuickDepends
qt5/include/QtQuick/QtQuickVersion
-qt5/include/QtQuick/designersupport.h
qt5/include/QtQuick/qquickframebufferobject.h
qt5/include/QtQuick/qquickimageprovider.h
qt5/include/QtQuick/qquickitem.h
@@ -582,8 +560,13 @@ qt5/include/QtQuick/qsgabstractrenderer.h
qt5/include/QtQuick/qsgengine.h
qt5/include/QtQuick/qsgflatcolormaterial.h
qt5/include/QtQuick/qsggeometry.h
+qt5/include/QtQuick/qsgimagenode.h
qt5/include/QtQuick/qsgmaterial.h
+qt5/include/QtQuick/qsgninepatchnode.h
qt5/include/QtQuick/qsgnode.h
+qt5/include/QtQuick/qsgrectanglenode.h
+qt5/include/QtQuick/qsgrendererinterface.h
+qt5/include/QtQuick/qsgrendernode.h
qt5/include/QtQuick/qsgsimplematerial.h
qt5/include/QtQuick/qsgsimplerectnode.h
qt5/include/QtQuick/qsgsimpletexturenode.h
@@ -591,6 +574,7 @@ qt5/include/QtQuick/qsgtexture.h
qt5/include/QtQuick/qsgtexturematerial.h
qt5/include/QtQuick/qsgtextureprovider.h
qt5/include/QtQuick/qsgvertexcolormaterial.h
+qt5/include/QtQuick/qtquick-config.h
qt5/include/QtQuick/qtquickglobal.h
qt5/include/QtQuick/qtquickversion.h
qt5/include/QtQuickParticles/${PKGVERSION}/QtQuickParticles/private/qquickage_p.h
@@ -646,35 +630,64 @@ qt5/include/QtQuickWidgets/qquickwidget.h
qt5/include/QtQuickWidgets/qtquickwidgetsglobal.h
qt5/include/QtQuickWidgets/qtquickwidgetsversion.h
qt5/lib/cmake/Qt5Qml/Qt5QmlConfig.cmake
+qt5/lib/cmake/Qt5Qml/Qt5QmlConfigExtras.cmake
qt5/lib/cmake/Qt5Qml/Qt5QmlConfigVersion.cmake
-qt5/lib/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake
-qt5/lib/cmake/Qt5Qml/Qt5Qml_QtQuick2Plugin.cmake
+qt5/lib/cmake/Qt5Qml/Qt5Qml_QDebugMessageServiceFactory.cmake
+qt5/lib/cmake/Qt5Qml/Qt5Qml_QLocalClientConnectionFactory.cmake
+qt5/lib/cmake/Qt5Qml/Qt5Qml_QQmlDebugServerFactory.cmake
+qt5/lib/cmake/Qt5Qml/Qt5Qml_QQmlDebuggerServiceFactory.cmake
+qt5/lib/cmake/Qt5Qml/Qt5Qml_QQmlInspectorServiceFactory.cmake
+qt5/lib/cmake/Qt5Qml/Qt5Qml_QQmlNativeDebugConnectorFactory.cmake
+qt5/lib/cmake/Qt5Qml/Qt5Qml_QQmlNativeDebugServiceFactory.cmake
+qt5/lib/cmake/Qt5Qml/Qt5Qml_QQmlProfilerServiceFactory.cmake
+qt5/lib/cmake/Qt5Qml/Qt5Qml_QQuickProfilerAdapterFactory.cmake
+qt5/lib/cmake/Qt5Qml/Qt5Qml_QTcpServerConnectionFactory.cmake
qt5/lib/cmake/Qt5Quick/Qt5QuickConfig.cmake
qt5/lib/cmake/Qt5Quick/Qt5QuickConfigVersion.cmake
qt5/lib/cmake/Qt5QuickTest/Qt5QuickTestConfig.cmake
qt5/lib/cmake/Qt5QuickTest/Qt5QuickTestConfigVersion.cmake
qt5/lib/cmake/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake
qt5/lib/cmake/Qt5QuickWidgets/Qt5QuickWidgetsConfigVersion.cmake
-qt5/lib/libQt5Qml.la
+qt5/lib/libQt5PacketProtocol.a
+qt5/lib/libQt5PacketProtocol.prl
qt5/lib/libQt5Qml.prl
-qt5/lib/libQt5QmlDevTools.la
+qt5/lib/libQt5Qml.so
+qt5/lib/libQt5Qml.so.${PKGVERSION}
+qt5/lib/libQt5Qml.so.5
+qt5/lib/libQt5Qml.so.5.10
+qt5/lib/libQt5QmlDebug.a
+qt5/lib/libQt5QmlDebug.prl
+qt5/lib/libQt5QmlDevTools.a
qt5/lib/libQt5QmlDevTools.prl
-qt5/lib/libQt5Quick.la
qt5/lib/libQt5Quick.prl
-qt5/lib/libQt5QuickParticles.la
+qt5/lib/libQt5Quick.so
+qt5/lib/libQt5Quick.so.${PKGVERSION}
+qt5/lib/libQt5Quick.so.5
+qt5/lib/libQt5Quick.so.5.10
qt5/lib/libQt5QuickParticles.prl
-qt5/lib/libQt5QuickTest.la
+qt5/lib/libQt5QuickParticles.so
+qt5/lib/libQt5QuickParticles.so.${PKGVERSION}
+qt5/lib/libQt5QuickParticles.so.5
+qt5/lib/libQt5QuickParticles.so.5.10
qt5/lib/libQt5QuickTest.prl
-qt5/lib/libQt5QuickWidgets.la
+qt5/lib/libQt5QuickTest.so
+qt5/lib/libQt5QuickTest.so.${PKGVERSION}
+qt5/lib/libQt5QuickTest.so.5
+qt5/lib/libQt5QuickTest.so.5.10
qt5/lib/libQt5QuickWidgets.prl
+qt5/lib/libQt5QuickWidgets.so
+qt5/lib/libQt5QuickWidgets.so.${PKGVERSION}
+qt5/lib/libQt5QuickWidgets.so.5
+qt5/lib/libQt5QuickWidgets.so.5.10
qt5/lib/pkgconfig/Qt5Qml.pc
-qt5/lib/pkgconfig/Qt5QmlDevTools.pc
qt5/lib/pkgconfig/Qt5Quick.pc
-qt5/lib/pkgconfig/Qt5QuickParticles.pc
qt5/lib/pkgconfig/Qt5QuickTest.pc
qt5/lib/pkgconfig/Qt5QuickWidgets.pc
+qt5/mkspecs/features/qmlcache.prf
+qt5/mkspecs/modules/qt_lib_packetprotocol_private.pri
qt5/mkspecs/modules/qt_lib_qml.pri
qt5/mkspecs/modules/qt_lib_qml_private.pri
+qt5/mkspecs/modules/qt_lib_qmldebug_private.pri
qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri
qt5/mkspecs/modules/qt_lib_qmltest.pri
qt5/mkspecs/modules/qt_lib_qmltest_private.pri
@@ -683,38 +696,59 @@ qt5/mkspecs/modules/qt_lib_quick_private.pri
qt5/mkspecs/modules/qt_lib_quickparticles_private.pri
qt5/mkspecs/modules/qt_lib_quickwidgets.pri
qt5/mkspecs/modules/qt_lib_quickwidgets_private.pri
-qt5/plugins/qmltooling/libqmldbg_qtquick2.la
-qt5/plugins/qmltooling/libqmldbg_tcp.la
-qt5/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la
+qt5/plugins/qmltooling/libqmldbg_debugger.so
+qt5/plugins/qmltooling/libqmldbg_inspector.so
+qt5/plugins/qmltooling/libqmldbg_local.so
+qt5/plugins/qmltooling/libqmldbg_messages.so
+qt5/plugins/qmltooling/libqmldbg_native.so
+qt5/plugins/qmltooling/libqmldbg_nativedebugger.so
+qt5/plugins/qmltooling/libqmldbg_profiler.so
+qt5/plugins/qmltooling/libqmldbg_quickprofiler.so
+qt5/plugins/qmltooling/libqmldbg_server.so
+qt5/plugins/qmltooling/libqmldbg_tcp.so
+qt5/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
qt5/qml/Qt/labs/folderlistmodel/plugins.qmltypes
qt5/qml/Qt/labs/folderlistmodel/qmldir
-qt5/qml/Qt/labs/settings/libqmlsettingsplugin.la
+qt5/qml/Qt/labs/handlers/libhandlersplugin.so
+qt5/qml/Qt/labs/handlers/qmldir
+qt5/qml/Qt/labs/settings/libqmlsettingsplugin.so
qt5/qml/Qt/labs/settings/plugins.qmltypes
qt5/qml/Qt/labs/settings/qmldir
-qt5/qml/QtQml/Models.2/libmodelsplugin.la
+qt5/qml/Qt/labs/sharedimage/libsharedimageplugin.so
+qt5/qml/Qt/labs/sharedimage/qmldir
+qt5/qml/QtQml/Models.2/libmodelsplugin.so
qt5/qml/QtQml/Models.2/plugins.qmltypes
qt5/qml/QtQml/Models.2/qmldir
-qt5/qml/QtQml/StateMachine/libqtqmlstatemachine.la
+qt5/qml/QtQml/StateMachine/libqtqmlstatemachine.so
qt5/qml/QtQml/StateMachine/plugins.qmltypes
qt5/qml/QtQml/StateMachine/qmldir
-qt5/qml/QtQuick.2/libqtquick2plugin.la
+qt5/qml/QtQml/plugins.qmltypes
+qt5/qml/QtQml/qmldir
+qt5/qml/QtQuick.2/libqtquick2plugin.so
qt5/qml/QtQuick.2/plugins.qmltypes
qt5/qml/QtQuick.2/qmldir
-qt5/qml/QtQuick/LocalStorage/libqmllocalstorageplugin.la
+qt5/qml/QtQuick/Layouts/libqquicklayoutsplugin.so
+qt5/qml/QtQuick/Layouts/plugins.qmltypes
+qt5/qml/QtQuick/Layouts/qmldir
+qt5/qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so
qt5/qml/QtQuick/LocalStorage/plugins.qmltypes
qt5/qml/QtQuick/LocalStorage/qmldir
-qt5/qml/QtQuick/Particles.2/libparticlesplugin.la
+qt5/qml/QtQuick/Particles.2/libparticlesplugin.so
qt5/qml/QtQuick/Particles.2/plugins.qmltypes
qt5/qml/QtQuick/Particles.2/qmldir
-qt5/qml/QtQuick/Window.2/libwindowplugin.la
+qt5/qml/QtQuick/Shapes/libqmlshapesplugin.so
+qt5/qml/QtQuick/Shapes/plugins.qmltypes
+qt5/qml/QtQuick/Shapes/qmldir
+qt5/qml/QtQuick/Window.2/libwindowplugin.so
qt5/qml/QtQuick/Window.2/plugins.qmltypes
qt5/qml/QtQuick/Window.2/qmldir
-qt5/qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.la
+qt5/qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so
qt5/qml/QtQuick/XmlListModel/plugins.qmltypes
qt5/qml/QtQuick/XmlListModel/qmldir
qt5/qml/QtTest/SignalSpy.qml
qt5/qml/QtTest/TestCase.qml
-qt5/qml/QtTest/libqmltestplugin.la
+qt5/qml/QtTest/libqmltestplugin.so
qt5/qml/QtTest/plugins.qmltypes
qt5/qml/QtTest/qmldir
qt5/qml/QtTest/testlogger.js
+qt5/qml/builtins.qmltypes
diff --git a/x11/qt5-qtdeclarative/buildlink3.mk b/x11/qt5-qtdeclarative/buildlink3.mk
index 8c6f703ad13..f0d80c8d701 100644
--- a/x11/qt5-qtdeclarative/buildlink3.mk
+++ b/x11/qt5-qtdeclarative/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2018/01/17 19:30:47 markd Exp $
BUILDLINK_TREE+= qt5-qtdeclarative
.if !defined(QT5_QTDECLARATIVE_BUILDLINK3_MK)
QT5_QTDECLARATIVE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.5.1nb9
+BUILDLINK_API_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.9.1
BUILDLINK_PKGSRCDIR.qt5-qtdeclarative?= ../../x11/qt5-qtdeclarative
BUILDLINK_INCDIRS.qt5-qtdeclarative+= qt5/include
diff --git a/x11/qt5-qtdeclarative/distinfo b/x11/qt5-qtdeclarative/distinfo
index 9be38ab8db7..1ddf68a94cf 100644
--- a/x11/qt5-qtdeclarative/distinfo
+++ b/x11/qt5-qtdeclarative/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.4 2016/01/28 16:58:18 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2018/01/17 19:30:47 markd Exp $
-SHA1 (qtdeclarative-opensource-src-5.5.1.tar.xz) = 57206b9ffe0485bfd35c0aad85737fb4a7b77c8b
-RMD160 (qtdeclarative-opensource-src-5.5.1.tar.xz) = 1d8939c42f4b510443365479ffe8bc525e0faac6
-SHA512 (qtdeclarative-opensource-src-5.5.1.tar.xz) = e8c25eeaca66cfb8b8bd014487ad81b8b9780e2f3e898b967d0923dbb40b54cd32c35859b7419e964319401995c27a229ed0ec9d1ec6d2aba84002b59abefddf
-Size (qtdeclarative-opensource-src-5.5.1.tar.xz) = 18627840 bytes
+SHA1 (qtdeclarative-everywhere-src-5.10.0.tar.xz) = bdfa91e5ec2d959f6fcdc0af757b18d10b55fd87
+RMD160 (qtdeclarative-everywhere-src-5.10.0.tar.xz) = 31620cce613a92d6933c827bd4759443cacb5a39
+SHA512 (qtdeclarative-everywhere-src-5.10.0.tar.xz) = 190183d060b987db37ffef10cf348401753a1bb8c282a6ef364153f9fb6876f8b2b9373d52e8a40cf86dd62af4396db015506ba8387d813b9f3ff6f2d88252a0
+Size (qtdeclarative-everywhere-src-5.10.0.tar.xz) = 21875096 bytes
SHA1 (patch-examples_quick_customitems_painteditem_painteditem.pro) = a3881ee92daae30130fa665c8686f2e1572ecc1a
SHA1 (patch-src_3rdparty_masm_assembler_ARMAssembler.h) = fbcbe9e0fd3514d95f54a858223b20bb34f52bb2
SHA1 (patch-src_3rdparty_masm_assembler_ARMv7Assembler.h) = 505b2a585a7ed98e63403a3cc44d839a4f80c01d
-SHA1 (patch-src_3rdparty_masm_wtf_MathExtras.h) = 4b86cfe54867a376ea6267e53566e457b577de7b
-SHA1 (patch-src_qml_jsruntime_qv4engine.cpp) = d103b01f06b2b73768d9bff430d5359615d8ed3e
-SHA1 (patch-src_qmldevtools_qmldevtools.pro) = 600955fcc1e0dfabe83ada9761a9a6f7e847b8a0
diff --git a/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_MathExtras.h b/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_MathExtras.h
deleted file mode 100644
index dd39e9f71b4..00000000000
--- a/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_MathExtras.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_3rdparty_masm_wtf_MathExtras.h,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-Skip bad section for SunOS, at least newer releases.
-
---- src/3rdparty/masm/wtf/MathExtras.h.orig 2014-02-01 20:38:03.000000000 +0000
-+++ src/3rdparty/masm/wtf/MathExtras.h
-@@ -88,7 +88,7 @@ inline double wtf_ceil(double x) { retur
-
- #endif
-
--#if OS(SOLARIS)
-+#if OS(notSOLARIS)
-
- namespace std {
-
diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp
deleted file mode 100644
index 28a2d3c738d..00000000000
--- a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_qml_jsruntime_qv4engine.cpp,v 1.3 2016/01/28 16:58:18 fhajny Exp $
-
-Get stack address/size on SunOS.
-
---- src/qml/jsruntime/qv4engine.cpp.orig 2015-10-13 04:37:50.000000000 +0000
-+++ src/qml/jsruntime/qv4engine.cpp
-@@ -139,13 +139,21 @@ quintptr getStackLimit()
- #if HAVE(PTHREAD_NP_H) && OS(FREEBSD)
- // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes
- if (pthread_attr_init(&attr) == 0 && pthread_attr_get_np(pthread_self(), &attr) == 0) {
--#else
-+#elif !OS(SOLARIS)
- if (pthread_getattr_np(pthread_self(), &attr) == 0) {
-+#else
-+ if (true) {
- #endif
- void *stackBottom = Q_NULLPTR;
- size_t stackSize = 0;
-
-+#if OS(SOLARIS)
-+ pthread_attr_init(&attr);
-+ pthread_attr_getstackaddr(&attr, &stackBottom);
-+ pthread_attr_getstacksize(&attr, &stackSize);
-+#else
- pthread_attr_getstack(&attr, &stackBottom, &stackSize);
-+#endif
- pthread_attr_destroy(&attr);
-
- # if defined(Q_OS_ANDROID)
diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro b/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro
deleted file mode 100644
index ae2b8a5c721..00000000000
--- a/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_qmldevtools_qmldevtools.pro,v 1.2 2015/10/26 19:03:59 adam Exp $
-
-* Create libQtQmlDevTools.so for qttools.
-
---- src/qmldevtools/qmldevtools.pro.orig 2015-06-29 20:12:36.000000000 +0000
-+++ src/qmldevtools/qmldevtools.pro
-@@ -1,7 +1,8 @@
--option(host_build)
- TARGET = QtQmlDevTools
- QT = core
--CONFIG += static internal_module qmldevtools_build
-+CONFIG += internal_module qmldevtools_build
-+target.path = $$[QT_INSTALL_LIBS]
-+INSTALLS += target
-
- # Don't use pch because the auto-generated header refers to QtBootstrap,
- # which doesn't exist
diff --git a/x11/qt5-qtdoc/Makefile b/x11/qt5-qtdoc/Makefile
index 01eeebff873..3a444dfb373 100644
--- a/x11/qt5-qtdoc/Makefile
+++ b/x11/qt5-qtdoc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2017/11/30 16:45:43 adam Exp $
+# $NetBSD: Makefile,v 1.32 2018/01/17 19:30:47 markd Exp $
-DISTNAME= qtdoc-opensource-src-${QTVERSION}
+DISTNAME= qtdoc-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtdoc-${QTVERSION}
-PKGREVISION= 15
COMMENT= Qt5 documentations
MAKE_ENV+= QTDIR=${QTDIR}
diff --git a/x11/qt5-qtdoc/PLIST b/x11/qt5-qtdoc/PLIST
index 6a9a3dd5a96..4cb43065903 100644
--- a/x11/qt5-qtdoc/PLIST
+++ b/x11/qt5-qtdoc/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2015/10/26 19:03:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/01/17 19:30:47 markd Exp $
qt5/doc/qtdoc.qch
-qt5/doc/qtdoc/3rdparty.html
qt5/doc/qtdoc/accelerators.html
qt5/doc/qtdoc/accessibility.html
qt5/doc/qtdoc/accessible-qtquick.html
@@ -13,6 +12,7 @@ qt5/doc/qtdoc/android-runtime-licensing-notes.html
qt5/doc/qtdoc/android-support.html
qt5/doc/qtdoc/android3rdpartylibs.html
qt5/doc/qtdoc/androidgs.html
+qt5/doc/qtdoc/androidservices.html
qt5/doc/qtdoc/annotated.html
qt5/doc/qtdoc/appicon.html
qt5/doc/qtdoc/atomic-operations.html
@@ -45,12 +45,12 @@ qt5/doc/qtdoc/examples-threadandconcurrent.html
qt5/doc/qtdoc/examples-widgets-tools.html
qt5/doc/qtdoc/examples-xml.html
qt5/doc/qtdoc/exceptionsafety.html
-qt5/doc/qtdoc/exportedfunctions.html
qt5/doc/qtdoc/fdl.html
qt5/doc/qtdoc/functions.html
qt5/doc/qtdoc/gettingstarted.html
qt5/doc/qtdoc/gettingstartedqml.html
qt5/doc/qtdoc/gettingstartedqt.html
+qt5/doc/qtdoc/gpl.html
qt5/doc/qtdoc/groups.html
qt5/doc/qtdoc/hierarchy.html
qt5/doc/qtdoc/highdpi.html
@@ -79,13 +79,6 @@ qt5/doc/qtdoc/images/deployment-mac-bundlestructure.png
qt5/doc/qtdoc/images/deployment-windows-depends.png
qt5/doc/qtdoc/images/draganddrop-examples.png
qt5/doc/qtdoc/images/flickr_application.png
-qt5/doc/qtdoc/images/gs-project1.png
-qt5/doc/qtdoc/images/gs-project2.png
-qt5/doc/qtdoc/images/gs1.png
-qt5/doc/qtdoc/images/gs2.png
-qt5/doc/qtdoc/images/gs3.png
-qt5/doc/qtdoc/images/gs4.png
-qt5/doc/qtdoc/images/gs5.png
qt5/doc/qtdoc/images/home.png
qt5/doc/qtdoc/images/ico_note.png
qt5/doc/qtdoc/images/ico_note_attention.png
@@ -93,8 +86,18 @@ qt5/doc/qtdoc/images/ico_out.png
qt5/doc/qtdoc/images/icon_QtCreator_78x78px.png
qt5/doc/qtdoc/images/icon_Qt_78x78px.png
qt5/doc/qtdoc/images/icon_Tools.png
+qt5/doc/qtdoc/images/kernel-settings.png
qt5/doc/qtdoc/images/layout-examples.png
qt5/doc/qtdoc/images/logo.png
+qt5/doc/qtdoc/images/notepad1.png
+qt5/doc/qtdoc/images/notepad2.png
+qt5/doc/qtdoc/images/notepad3.png
+qt5/doc/qtdoc/images/notepad4.png
+qt5/doc/qtdoc/images/ok.png
+qt5/doc/qtdoc/images/open-project.png
+qt5/doc/qtdoc/images/project-view-2.png
+qt5/doc/qtdoc/images/project-view.png
+qt5/doc/qtdoc/images/project-wizard.png
qt5/doc/qtdoc/images/qml-extending-types.png
qt5/doc/qtdoc/images/qml-texteditor1_button.png
qt5/doc/qtdoc/images/qml-texteditor1_editmenu.png
@@ -125,12 +128,13 @@ qt5/doc/qtdoc/images/qt5_shadereffect.jpg
qt5/doc/qtdoc/images/qt5_video.jpg
qt5/doc/qtdoc/images/qt5_widgets.jpg
qt5/doc/qtdoc/images/qtcreator-run.png
+qt5/doc/qtdoc/images/qtlocation-mapviewer-demo.jpg
qt5/doc/qtdoc/images/qtpositioning_weatherinfo_ex.jpg
-qt5/doc/qtdoc/images/qtquickcontrols-example-gallery-android.png
-qt5/doc/qtdoc/images/qtquickcontrols-example-gallery-osx.png
+qt5/doc/qtdoc/images/qtquickcontrols2-material.png
qt5/doc/qtdoc/images/qtsensors_accelbubble_ex.jpg
qt5/doc/qtdoc/images/qtwebengine_quicknanobrowser.jpg
qt5/doc/qtdoc/images/scalability-gridlayout.png
+qt5/doc/qtdoc/images/select-item-to-add.png
qt5/doc/qtdoc/images/session.png
qt5/doc/qtdoc/images/sql-examples.png
qt5/doc/qtdoc/images/thread-examples.png
@@ -139,14 +143,20 @@ qt5/doc/qtdoc/images/threadvisual-example.png
qt5/doc/qtdoc/images/tool-examples.png
qt5/doc/qtdoc/images/xml-examples.png
qt5/doc/qtdoc/index.html
-qt5/doc/qtdoc/install-wince.html
+qt5/doc/qtdoc/integrity-building-monolith.html
+qt5/doc/qtdoc/integrity-building-qt-for-imx6quad-board.html
+qt5/doc/qtdoc/integrity-building-u-boot-image.html
+qt5/doc/qtdoc/integrity-creating-bootable-sd-card.html
+qt5/doc/qtdoc/integrity-installing-dependencies.html
+qt5/doc/qtdoc/integrity-monolith-project-tutorial.html
+qt5/doc/qtdoc/integrity-preparing-bsp-for-imx6quad-board.html
+qt5/doc/qtdoc/integrity-preparing-u-boot.html
qt5/doc/qtdoc/internationalization.html
qt5/doc/qtdoc/ios-support.html
qt5/doc/qtdoc/ipc.html
qt5/doc/qtdoc/known-issues.html
qt5/doc/qtdoc/lgpl.html
-qt5/doc/qtdoc/licenses-fonts.html
-qt5/doc/qtdoc/licenses.html
+qt5/doc/qtdoc/licenses-used-in-qt.html
qt5/doc/qtdoc/licensing.html
qt5/doc/qtdoc/linux-building.html
qt5/doc/qtdoc/linux-deployment.html
@@ -161,10 +171,15 @@ qt5/doc/qtdoc/modules-qml.html
qt5/doc/qtdoc/modules.html
qt5/doc/qtdoc/namespaces.html
qt5/doc/qtdoc/newclasses51.html
+qt5/doc/qtdoc/newclasses510.html
qt5/doc/qtdoc/newclasses52.html
qt5/doc/qtdoc/newclasses53.html
qt5/doc/qtdoc/newclasses54.html
qt5/doc/qtdoc/newclasses55.html
+qt5/doc/qtdoc/newclasses56.html
+qt5/doc/qtdoc/newclasses57.html
+qt5/doc/qtdoc/newclasses58.html
+qt5/doc/qtdoc/newclasses59.html
qt5/doc/qtdoc/obsoleteclasses.html
qt5/doc/qtdoc/obsoleteqmltypes.html
qt5/doc/qtdoc/opensourcelicense.html
@@ -180,7 +195,6 @@ qt5/doc/qtdoc/platform-notes-android.html
qt5/doc/qtdoc/platform-notes-integrity.html
qt5/doc/qtdoc/platform-notes-ios.html
qt5/doc/qtdoc/platform-notes-qnx.html
-qt5/doc/qtdoc/platform-notes-qtee.html
qt5/doc/qtdoc/platform-notes-vxworks.html
qt5/doc/qtdoc/plugins-howto.html
qt5/doc/qtdoc/porting-to-ios.html
@@ -194,22 +208,23 @@ qt5/doc/qtdoc/qml-glossary.html
qt5/doc/qtdoc/qmlapplications.html
qt5/doc/qtdoc/qmlbasictypes.html
qt5/doc/qtdoc/qmlfirststeps.html
-qt5/doc/qtdoc/qmlmodules.html
qt5/doc/qtdoc/qmltypes.html
qt5/doc/qtdoc/qpa.html
qt5/doc/qtdoc/qt-activex.html
+qt5/doc/qtdoc/qt-attribution-cmake-macros.html
+qt5/doc/qtdoc/qt-attribution-llvmpipe.html
qt5/doc/qtdoc/qt-conf.html
qt5/doc/qtdoc/qt-embedded-fonts.html
qt5/doc/qtdoc/qt-embedded-kmap2qmap.html
qt5/doc/qtdoc/qt-embedded-makeqpf.html
qt5/doc/qtdoc/qt-gui-concepts.html
qt5/doc/qtdoc/qt5-intro.html
-qt5/doc/qtdoc/qtce.html
qt5/doc/qtdoc/qtconcurrent-mtexamples.html
qt5/doc/qtdoc/qtconcurrentexamples.html
qt5/doc/qtdoc/qtdoc.index
qt5/doc/qtdoc/qtdoc.qhp
qt5/doc/qtdoc/qtdoc.qhp.sha1
+qt5/doc/qtdoc/qtexamples.html
qt5/doc/qtdoc/qtexamplesandtutorials.html
qt5/doc/qtdoc/qtmain.html
qt5/doc/qtdoc/qtmodules.html
@@ -234,18 +249,18 @@ qt5/doc/qtdoc/qtquickcontrols-texteditor.html
qt5/doc/qtdoc/qundo.html
qt5/doc/qtdoc/rcc.html
qt5/doc/qtdoc/reference-overview.html
-qt5/doc/qtdoc/requirements-wince.html
qt5/doc/qtdoc/restoring-geometry.html
qt5/doc/qtdoc/scalability.html
qt5/doc/qtdoc/session.html
-qt5/doc/qtdoc/shadow.html
qt5/doc/qtdoc/sharedlibrary.html
qt5/doc/qtdoc/signalsandslots-syntaxes.html
qt5/doc/qtdoc/sourcebreaks.html
qt5/doc/qtdoc/sql-examples.html
qt5/doc/qtdoc/string-processing.html
+qt5/doc/qtdoc/style/offline-simple.css
qt5/doc/qtdoc/style/offline.css
qt5/doc/qtdoc/style/qt5-sidebar.html
+qt5/doc/qtdoc/supported-platforms-and-configurations.html
qt5/doc/qtdoc/supported-platforms.html
qt5/doc/qtdoc/testing-and-debugging.html
qt5/doc/qtdoc/third-party-libraries.html
@@ -270,22 +285,24 @@ qt5/doc/qtdoc/trademarks.html
qt5/doc/qtdoc/uic.html
qt5/doc/qtdoc/unicode.html
qt5/doc/qtdoc/unix-signals.html
+qt5/doc/qtdoc/vxworks.html
qt5/doc/qtdoc/whatsnew50.html
qt5/doc/qtdoc/whatsnew51.html
+qt5/doc/qtdoc/whatsnew510.html
qt5/doc/qtdoc/whatsnew52.html
qt5/doc/qtdoc/whatsnew53.html
qt5/doc/qtdoc/whatsnew54.html
qt5/doc/qtdoc/whatsnew55.html
+qt5/doc/qtdoc/whatsnew56.html
+qt5/doc/qtdoc/whatsnew57.html
+qt5/doc/qtdoc/whatsnew58.html
+qt5/doc/qtdoc/whatsnew59.html
qt5/doc/qtdoc/why-moc.html
-qt5/doc/qtdoc/wince-with-qt-introduction.html
qt5/doc/qtdoc/windows-building.html
qt5/doc/qtdoc/windows-deployment.html
qt5/doc/qtdoc/windows-issues.html
qt5/doc/qtdoc/windows-requirements.html
qt5/doc/qtdoc/windows-support.html
-qt5/doc/qtdoc/windowsce-customization.html
-qt5/doc/qtdoc/windowsce-opengl.html
-qt5/doc/qtdoc/windowsce-signing.html
qt5/doc/qtdoc/winrt-support.html
qt5/doc/qtdoc/xml-examples.html
@pkgdir qt5/doc/qtdoc/scripts
diff --git a/x11/qt5-qtdoc/distinfo b/x11/qt5-qtdoc/distinfo
index 35fc4c414c0..270a5c4461a 100644
--- a/x11/qt5-qtdoc/distinfo
+++ b/x11/qt5-qtdoc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:03:59 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 19:30:47 markd Exp $
-SHA1 (qtdoc-opensource-src-5.5.1.tar.xz) = 6ddf19ac4f6945221d1ccb4ae76ee8a18d207067
-RMD160 (qtdoc-opensource-src-5.5.1.tar.xz) = 907fc8eefba4e2c836143474f9abd99c0b0bf79f
-SHA512 (qtdoc-opensource-src-5.5.1.tar.xz) = 0eb2756bcc72d65ba743ed1a26827d62e9bfc9856b35dbcea869b22a339c1ca614bd8f221d66e046a38e8f283b984613bba232c491ecd4117d8dd23a2267b54c
-Size (qtdoc-opensource-src-5.5.1.tar.xz) = 2669772 bytes
+SHA1 (qtdoc-everywhere-src-5.10.0.tar.xz) = f607351c30c93c53d6a846e9a17d7786622e275d
+RMD160 (qtdoc-everywhere-src-5.10.0.tar.xz) = 304a217c9b6c43e523d6c2cad774f5231d443c5a
+SHA512 (qtdoc-everywhere-src-5.10.0.tar.xz) = 2c2162785abf14ef7dca6b627ed6a07378a21b6f9f8473c943e2f7bb0f3d3c4baa1f5a4024fd3f15f8b60fba25130a1ce40faf602847e4a0362e7a94c6a852ff
+Size (qtdoc-everywhere-src-5.10.0.tar.xz) = 4580388 bytes
diff --git a/x11/qt5-qtgraphicaleffects/Makefile b/x11/qt5-qtgraphicaleffects/Makefile
index 4ea04e4d8bc..bd3c2d5586b 100644
--- a/x11/qt5-qtgraphicaleffects/Makefile
+++ b/x11/qt5-qtgraphicaleffects/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/11/30 16:45:43 adam Exp $
+# $NetBSD: Makefile,v 1.22 2018/01/17 19:30:47 markd Exp $
-DISTNAME= qtgraphicaleffects-opensource-src-${QTVERSION}
+DISTNAME= qtgraphicaleffects-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtgraphicaleffects-${QTVERSION}
-PKGREVISION= 9
COMMENT= Qt5 module for Graphics effects
BUILD_TARGET= sub-src
diff --git a/x11/qt5-qtgraphicaleffects/PLIST b/x11/qt5-qtgraphicaleffects/PLIST
index 9ff0e5919d2..2ef45d99f00 100644
--- a/x11/qt5-qtgraphicaleffects/PLIST
+++ b/x11/qt5-qtgraphicaleffects/PLIST
@@ -1,35 +1,72 @@
-@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:35 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/01/17 19:30:47 markd Exp $
qt5/qml/QtGraphicalEffects/Blend.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/Blend.qmlc
qt5/qml/QtGraphicalEffects/BrightnessContrast.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/BrightnessContrast.qmlc
qt5/qml/QtGraphicalEffects/ColorOverlay.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/ColorOverlay.qmlc
qt5/qml/QtGraphicalEffects/Colorize.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/Colorize.qmlc
qt5/qml/QtGraphicalEffects/ConicalGradient.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/ConicalGradient.qmlc
qt5/qml/QtGraphicalEffects/Desaturate.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/Desaturate.qmlc
qt5/qml/QtGraphicalEffects/DirectionalBlur.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/DirectionalBlur.qmlc
qt5/qml/QtGraphicalEffects/Displace.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/Displace.qmlc
qt5/qml/QtGraphicalEffects/DropShadow.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/DropShadow.qmlc
qt5/qml/QtGraphicalEffects/FastBlur.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/FastBlur.qmlc
qt5/qml/QtGraphicalEffects/GammaAdjust.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/GammaAdjust.qmlc
qt5/qml/QtGraphicalEffects/GaussianBlur.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/GaussianBlur.qmlc
qt5/qml/QtGraphicalEffects/Glow.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/Glow.qmlc
qt5/qml/QtGraphicalEffects/HueSaturation.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/HueSaturation.qmlc
qt5/qml/QtGraphicalEffects/InnerShadow.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/InnerShadow.qmlc
qt5/qml/QtGraphicalEffects/LevelAdjust.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/LevelAdjust.qmlc
qt5/qml/QtGraphicalEffects/LinearGradient.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/LinearGradient.qmlc
qt5/qml/QtGraphicalEffects/MaskedBlur.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/MaskedBlur.qmlc
qt5/qml/QtGraphicalEffects/OpacityMask.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/OpacityMask.qmlc
qt5/qml/QtGraphicalEffects/RadialBlur.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/RadialBlur.qmlc
qt5/qml/QtGraphicalEffects/RadialGradient.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/RadialGradient.qmlc
qt5/qml/QtGraphicalEffects/RectangularGlow.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/RectangularGlow.qmlc
qt5/qml/QtGraphicalEffects/RecursiveBlur.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/RecursiveBlur.qmlc
qt5/qml/QtGraphicalEffects/ThresholdMask.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/ThresholdMask.qmlc
qt5/qml/QtGraphicalEffects/ZoomBlur.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/ZoomBlur.qmlc
+qt5/qml/QtGraphicalEffects/libqtgraphicaleffectsplugin.so
+qt5/qml/QtGraphicalEffects/plugins.qmltypes
+qt5/qml/QtGraphicalEffects/private/DropShadowBase.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/private/DropShadowBase.qmlc
qt5/qml/QtGraphicalEffects/private/FastGlow.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/private/FastGlow.qmlc
qt5/qml/QtGraphicalEffects/private/FastInnerShadow.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/private/FastInnerShadow.qmlc
qt5/qml/QtGraphicalEffects/private/FastMaskedBlur.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/private/FastMaskedBlur.qmlc
qt5/qml/QtGraphicalEffects/private/GaussianDirectionalBlur.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/private/GaussianDirectionalBlur.qmlc
qt5/qml/QtGraphicalEffects/private/GaussianGlow.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/private/GaussianGlow.qmlc
qt5/qml/QtGraphicalEffects/private/GaussianInnerShadow.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/private/GaussianInnerShadow.qmlc
qt5/qml/QtGraphicalEffects/private/GaussianMaskedBlur.qml
-qt5/qml/QtGraphicalEffects/private/SourceProxy.qml
+${PLIST.jit}qt5/qml/QtGraphicalEffects/private/GaussianMaskedBlur.qmlc
+qt5/qml/QtGraphicalEffects/private/libqtgraphicaleffectsprivate.so
+qt5/qml/QtGraphicalEffects/private/qmldir
qt5/qml/QtGraphicalEffects/qmldir
diff --git a/x11/qt5-qtgraphicaleffects/distinfo b/x11/qt5-qtgraphicaleffects/distinfo
index 5c09d105437..e8213b8043a 100644
--- a/x11/qt5-qtgraphicaleffects/distinfo
+++ b/x11/qt5-qtgraphicaleffects/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:03:59 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 19:30:47 markd Exp $
-SHA1 (qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 9a6b6211f507dafb7d995b5cbf390beb18a77c2b
-RMD160 (qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 43f6a91f75863f8333fc6b70456f1b0d175b55e4
-SHA512 (qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = b01ca47e68ce3653d1e203199b5e770f37c49e243233a1a4560cec22c7f10553934e28fbbea49ae5464ed68b4ab6387e5499c2b5277a44b571f6d963bf2caee1
-Size (qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 14329444 bytes
+SHA1 (qtgraphicaleffects-everywhere-src-5.10.0.tar.xz) = 874c2aad84b4ba23d30a2b8b4597a42feef8a2f0
+RMD160 (qtgraphicaleffects-everywhere-src-5.10.0.tar.xz) = b4aeade2f04fcad002612cdcc862a100a8e04a77
+SHA512 (qtgraphicaleffects-everywhere-src-5.10.0.tar.xz) = 40b4b40eb41c2ebf114b38cb1f628c30fb062ad614647a538f3fb03308b6ecff9937426fea94ee8e1c7d4eb3ec100e9df731de751e11a95790337e55b40dea00
+Size (qtgraphicaleffects-everywhere-src-5.10.0.tar.xz) = 14513884 bytes
diff --git a/x11/qt5-qtimageformats/Makefile b/x11/qt5-qtimageformats/Makefile
index 883e9401aec..040e94f0305 100644
--- a/x11/qt5-qtimageformats/Makefile
+++ b/x11/qt5-qtimageformats/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: Makefile,v 1.25 2018/01/17 19:30:47 markd Exp $
-DISTNAME= qtimageformats-opensource-src-${QTVERSION}
+DISTNAME= qtimageformats-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtimageformats-${QTVERSION}
-PKGREVISION= 11
COMMENT= Qt5 module for Image formats
BUILD_TARGET= sub-src
diff --git a/x11/qt5-qtimageformats/PLIST b/x11/qt5-qtimageformats/PLIST
index b85023b9053..144d0021fb2 100644
--- a/x11/qt5-qtimageformats/PLIST
+++ b/x11/qt5-qtimageformats/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/12/30 17:23:46 adam Exp $
-qt5/lib/cmake/Qt5Gui/Qt5Gui_QDDSPlugin.cmake
+@comment $NetBSD: PLIST,v 1.3 2018/01/17 19:30:47 markd Exp $
qt5/lib/cmake/Qt5Gui/Qt5Gui_QICNSPlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QJp2Plugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QMngPlugin.cmake
@@ -7,11 +6,10 @@ qt5/lib/cmake/Qt5Gui/Qt5Gui_QTgaPlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QTiffPlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QWbmpPlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QWebpPlugin.cmake
-qt5/plugins/imageformats/libqdds.la
-qt5/plugins/imageformats/libqicns.la
-qt5/plugins/imageformats/libqjp2.la
-qt5/plugins/imageformats/libqmng.la
-qt5/plugins/imageformats/libqtga.la
-qt5/plugins/imageformats/libqtiff.la
-qt5/plugins/imageformats/libqwbmp.la
-qt5/plugins/imageformats/libqwebp.la
+qt5/plugins/imageformats/libqicns.so
+qt5/plugins/imageformats/libqjp2.so
+qt5/plugins/imageformats/libqmng.so
+qt5/plugins/imageformats/libqtga.so
+qt5/plugins/imageformats/libqtiff.so
+qt5/plugins/imageformats/libqwbmp.so
+qt5/plugins/imageformats/libqwebp.so
diff --git a/x11/qt5-qtimageformats/buildlink3.mk b/x11/qt5-qtimageformats/buildlink3.mk
index 0f9cda42c5a..f383bea60a6 100644
--- a/x11/qt5-qtimageformats/buildlink3.mk
+++ b/x11/qt5-qtimageformats/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.19 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2018/01/17 19:30:47 markd Exp $
BUILDLINK_TREE+= qt5-qtimageformats
.if !defined(QT5_QTIMAGEFORMATS_BUILDLINK3_MK)
QT5_QTIMAGEFORMATS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtimageformats+= qt5-qtimageformats>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtimageformats+= qt5-qtimageformats>=5.5.1nb11
+BUILDLINK_API_DEPENDS.qt5-qtimageformats+= qt5-qtimageformats>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtimageformats+= qt5-qtimageformats>=5.9.1
BUILDLINK_PKGSRCDIR.qt5-qtimageformats?= ../../x11/qt5-qtimageformats
BUILDLINK_INCDIRS.qt5-qtimageformats+= qt5/include
diff --git a/x11/qt5-qtimageformats/distinfo b/x11/qt5-qtimageformats/distinfo
index 4b1b3af28d6..13d0feeb703 100644
--- a/x11/qt5-qtimageformats/distinfo
+++ b/x11/qt5-qtimageformats/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:03:59 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 19:30:47 markd Exp $
-SHA1 (qtimageformats-opensource-src-5.5.1.tar.xz) = e454791169abf781c412c087f26a9338deaca979
-RMD160 (qtimageformats-opensource-src-5.5.1.tar.xz) = 75000000ddfbb83b960b73c07d2083b85dcd81fa
-SHA512 (qtimageformats-opensource-src-5.5.1.tar.xz) = cee25ebf12d8e95c9539aa3b8d6f464f65fbceb1c637961bd2fd997ae803a5fda4b9a2ad96fe406cfa95609213f0ce9f2c82dba6ccc7413217b4e1a2f99a8049
-Size (qtimageformats-opensource-src-5.5.1.tar.xz) = 1892820 bytes
+SHA1 (qtimageformats-everywhere-src-5.10.0.tar.xz) = 2a40e0e85de175bc5d06ca17ee5bdbef817a3813
+RMD160 (qtimageformats-everywhere-src-5.10.0.tar.xz) = aa80332b81c908c8b04f39b654b3cd2575bf0848
+SHA512 (qtimageformats-everywhere-src-5.10.0.tar.xz) = cff0fdcb8ea97da343dba89cc186bc03981f1ed66cd5420dbcdc7b4dd438cc52079fcc4fda72222ed42741825626be3fe47454e67a84805476001a506b602f20
+Size (qtimageformats-everywhere-src-5.10.0.tar.xz) = 2136484 bytes
diff --git a/x11/qt5-qtlocation/Makefile b/x11/qt5-qtlocation/Makefile
index a45271a35c5..d11313e688c 100644
--- a/x11/qt5-qtlocation/Makefile
+++ b/x11/qt5-qtlocation/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: Makefile,v 1.22 2018/01/17 19:30:47 markd Exp $
-DISTNAME= qtlocation-opensource-src-${QTVERSION}
+DISTNAME= qtlocation-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtlocation-${QTVERSION}
-PKGREVISION= 9
COMMENT= Qt5 module for qtlocation
BUILD_TARGET= sub-src
diff --git a/x11/qt5-qtlocation/PLIST b/x11/qt5-qtlocation/PLIST
index cd7d78cb997..50df6547144 100644
--- a/x11/qt5-qtlocation/PLIST
+++ b/x11/qt5-qtlocation/PLIST
@@ -1,42 +1,90 @@
-@comment $NetBSD: PLIST,v 1.4 2015/10/26 19:04:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/01/17 19:30:47 markd Exp $
lib/pkgconfig/Qt5Positioning.pc
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/error_messages_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/locationvaluetypehelper_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/mapitemviewdelegateincubator_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qabstractgeotilecache_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qcache3q_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativecategory_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativecirclemapitem_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativecontactdetail_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeocodemodel_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomaneuver_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomap_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapcopyrightsnotice_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapitembase_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapitemgroup_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapitemview_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapitemview_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapparameter_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapquickitem_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomaptype_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeoroute_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeoroutemodel_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeoroutesegment_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeoserviceprovider_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativeperiod_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativeplace_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativeplaceattribute_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativeplacecontentmodel_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativeplaceeditorialmodel_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativeplaceicon_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativeplaceimagemodel_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativeplaceuser_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativepolygonmapitem_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativepolylinemapitem_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativeratings_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativerectanglemapitem_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativereviewmodel_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativeroutemapitem_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativesearchmodelbase_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativesearchresultmodel_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativesearchsuggestionmodel_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativesupplier_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativesupportedcategoriesmodel_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocameracapabilities_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocameradata_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocameratiles_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocodereply_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocodingmanager_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocodingmanagerengine_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeofiletilecache_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomaneuver_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomap_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomap_p_p.h
-qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapcontroller_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapitemgeometry_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapparameter_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanager_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanager_p_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanagerengine_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanagerengine_p_p.h
-qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapscene_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomaptype_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomaptype_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoprojection_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroute_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeorouteparser_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeorouteparser_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeorouteparserosrmv4_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeorouteparserosrmv5_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutereply_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeorouterequest_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutesegment_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutingmanager_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutingmanagerengine_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoserviceprovider_p.h
-qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilecache_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmap_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmap_p_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmappingmanagerengine_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapreply_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapreply_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapscene_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilefetcher_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilefetcher_p_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilerequestmanager_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilespec_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilespec_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qlocationglobal_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplace_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceattribute_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacecategory_p.h
@@ -55,6 +103,8 @@ qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacereview_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacesearchresult_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacesupplier_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceuser_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qquickgeomapgesturearea_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qtlocation-config_p.h
qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/unsupportedreplies_p.h
qt5/include/QtLocation/QGeoCodeReply
qt5/include/QtLocation/QGeoCodingManager
@@ -141,27 +191,37 @@ qt5/include/QtLocation/qplacesearchresult.h
qt5/include/QtLocation/qplacesearchsuggestionreply.h
qt5/include/QtLocation/qplacesupplier.h
qt5/include/QtLocation/qplaceuser.h
+qt5/include/QtLocation/qtlocation-config.h
qt5/include/QtLocation/qtlocationversion.h
+qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qclipperutils_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdeclarativegeoaddress_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdeclarativegeolocation_p.h
+qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdoublematrix4x4_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdoublevector2d_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdoublevector3d_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeoaddress_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeocircle_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeocoordinate_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeolocation_p.h
+qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeopath_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeopositioninfosource_p.h
-qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeoprojection_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeorectangle_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeoshape_p.h
+qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qlocationdata_simulator_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qlocationutils_p.h
qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qnmeapositioninfosource_p.h
+qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qpositioningglobal_p.h
+qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qtpositioning-config_p.h
+qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qwebmercator_p.h
qt5/include/QtPositioning/QGeoAddress
qt5/include/QtPositioning/QGeoAreaMonitorInfo
qt5/include/QtPositioning/QGeoAreaMonitorSource
qt5/include/QtPositioning/QGeoCircle
qt5/include/QtPositioning/QGeoCoordinate
qt5/include/QtPositioning/QGeoLocation
+qt5/include/QtPositioning/QGeoPath
+qt5/include/QtPositioning/QGeoPolygon
+qt5/include/QtPositioning/QGeoPolygonPrivate
qt5/include/QtPositioning/QGeoPositionInfo
qt5/include/QtPositioning/QGeoPositionInfoSource
qt5/include/QtPositioning/QGeoPositionInfoSourceFactory
@@ -179,6 +239,8 @@ qt5/include/QtPositioning/qgeoareamonitorsource.h
qt5/include/QtPositioning/qgeocircle.h
qt5/include/QtPositioning/qgeocoordinate.h
qt5/include/QtPositioning/qgeolocation.h
+qt5/include/QtPositioning/qgeopath.h
+qt5/include/QtPositioning/qgeopolygon.h
qt5/include/QtPositioning/qgeopositioninfo.h
qt5/include/QtPositioning/qgeopositioninfosource.h
qt5/include/QtPositioning/qgeopositioninfosourcefactory.h
@@ -188,32 +250,45 @@ qt5/include/QtPositioning/qgeosatelliteinfosource.h
qt5/include/QtPositioning/qgeoshape.h
qt5/include/QtPositioning/qnmeapositioninfosource.h
qt5/include/QtPositioning/qpositioningglobal.h
+qt5/include/QtPositioning/qtpositioning-config.h
qt5/include/QtPositioning/qtpositioningversion.h
qt5/lib/cmake/Qt5Location/Qt5LocationConfig.cmake
qt5/lib/cmake/Qt5Location/Qt5LocationConfigVersion.cmake
+qt5/lib/cmake/Qt5Location/Qt5Location_GeoServiceProviderFactoryEsri.cmake
+qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryItemsOverlay.cmake
qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapbox.cmake
qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryNokia.cmake
qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake
qt5/lib/cmake/Qt5Positioning/Qt5PositioningConfig.cmake
qt5/lib/cmake/Qt5Positioning/Qt5PositioningConfigVersion.cmake
+qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake
qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake
-qt5/lib/libQt5Location.la
qt5/lib/libQt5Location.prl
-qt5/lib/libQt5Positioning.la
+qt5/lib/libQt5Location.so
+qt5/lib/libQt5Location.so.${PKGVERSION}
+qt5/lib/libQt5Location.so.5
+qt5/lib/libQt5Location.so.5.10
qt5/lib/libQt5Positioning.prl
+qt5/lib/libQt5Positioning.so
+qt5/lib/libQt5Positioning.so.${PKGVERSION}
+qt5/lib/libQt5Positioning.so.5
+qt5/lib/libQt5Positioning.so.5.10
qt5/lib/pkgconfig/Qt5Location.pc
qt5/lib/pkgconfig/Qt5Positioning.pc
qt5/mkspecs/modules/qt_lib_location.pri
qt5/mkspecs/modules/qt_lib_location_private.pri
qt5/mkspecs/modules/qt_lib_positioning.pri
qt5/mkspecs/modules/qt_lib_positioning_private.pri
-qt5/plugins/geoservices/libqtgeoservices_mapbox.la
-qt5/plugins/geoservices/libqtgeoservices_nokia.la
-qt5/plugins/geoservices/libqtgeoservices_osm.la
-qt5/plugins/position/libqtposition_positionpoll.la
-qt5/qml/QtLocation/libdeclarative_location.la
+qt5/plugins/geoservices/libqtgeoservices_esri.so
+qt5/plugins/geoservices/libqtgeoservices_itemsoverlay.so
+qt5/plugins/geoservices/libqtgeoservices_mapbox.so
+qt5/plugins/geoservices/libqtgeoservices_nokia.so
+qt5/plugins/geoservices/libqtgeoservices_osm.so
+qt5/plugins/position/libqtposition_geoclue.so
+qt5/plugins/position/libqtposition_positionpoll.so
+qt5/qml/QtLocation/libdeclarative_location.so
qt5/qml/QtLocation/plugins.qmltypes
qt5/qml/QtLocation/qmldir
-qt5/qml/QtPositioning/libdeclarative_positioning.la
+qt5/qml/QtPositioning/libdeclarative_positioning.so
qt5/qml/QtPositioning/plugins.qmltypes
qt5/qml/QtPositioning/qmldir
diff --git a/x11/qt5-qtlocation/PLIST.Darwin b/x11/qt5-qtlocation/PLIST.Darwin
new file mode 100644
index 00000000000..53dcffdafd4
--- /dev/null
+++ b/x11/qt5-qtlocation/PLIST.Darwin
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2018/01/17 19:30:47 markd Exp $
+qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryCL.cmake
+qt5/plugins/position/libqtposition_cl.so
diff --git a/x11/qt5-qtlocation/PLIST.Linux b/x11/qt5-qtlocation/PLIST.Linux
new file mode 100644
index 00000000000..fd5ec4992c4
--- /dev/null
+++ b/x11/qt5-qtlocation/PLIST.Linux
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2018/01/17 19:30:47 markd Exp $
+qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapboxGL.cmake
+qt5/plugins/geoservices/libqtgeoservices_mapboxgl.so
diff --git a/x11/qt5-qtlocation/buildlink3.mk b/x11/qt5-qtlocation/buildlink3.mk
index dabfdc4a94e..bbf2a6f54ae 100644
--- a/x11/qt5-qtlocation/buildlink3.mk
+++ b/x11/qt5-qtlocation/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.18 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/17 19:30:47 markd Exp $
BUILDLINK_TREE+= qt5-qtlocation
.if !defined(QT5_QTLOCATION_BUILDLINK3_MK)
QT5_QTLOCATION_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtlocation+= qt5-qtlocation>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtlocation+= qt5-qtlocation>=5.5.1nb9
+BUILDLINK_API_DEPENDS.qt5-qtlocation+= qt5-qtlocation>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtlocation+= qt5-qtlocation>=5.9.1
BUILDLINK_PKGSRCDIR.qt5-qtlocation?= ../../x11/qt5-qtlocation
BUILDLINK_INCDIRS.qt5-qtlocation+= qt5/include
diff --git a/x11/qt5-qtlocation/distinfo b/x11/qt5-qtlocation/distinfo
index d65ee193805..23916314daf 100644
--- a/x11/qt5-qtlocation/distinfo
+++ b/x11/qt5-qtlocation/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 19:30:47 markd Exp $
-SHA1 (qtlocation-opensource-src-5.5.1.tar.xz) = 700bf32e15c7d808e71bca7b908b08111e81eda4
-RMD160 (qtlocation-opensource-src-5.5.1.tar.xz) = 3792eedc159db6bf15eef706ee218f3cc5759a51
-SHA512 (qtlocation-opensource-src-5.5.1.tar.xz) = d7b1563fdfdb628e78f5a1cdd7c381221888370f96446d47eedb1bc4dbbffb512bc336940f0fc6b65501c2d8ff81eff153512ff231c74e760907122683172ba2
-Size (qtlocation-opensource-src-5.5.1.tar.xz) = 3108096 bytes
+SHA1 (qtlocation-everywhere-src-5.10.0.tar.xz) = 69c86cd5c1fdcf039e5a65b12f969c167f78d85f
+RMD160 (qtlocation-everywhere-src-5.10.0.tar.xz) = 0a76830417abf3fd8022f2bdd4c7df6ba5e5481b
+SHA512 (qtlocation-everywhere-src-5.10.0.tar.xz) = 0a5eb72b8d60962a76b2c0cc699308586f3d0febce956e3a6edbcf808a3d752f66c05ee84a4b3a6547415ddc4e49b712fc375e57cf4aa5bd260b7f4955ee9791
+Size (qtlocation-everywhere-src-5.10.0.tar.xz) = 5435368 bytes
diff --git a/x11/qt5-qtmultimedia/Makefile b/x11/qt5-qtmultimedia/Makefile
index b3438fcac6e..c29d07e70e9 100644
--- a/x11/qt5-qtmultimedia/Makefile
+++ b/x11/qt5-qtmultimedia/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: Makefile,v 1.36 2018/01/17 19:30:47 markd Exp $
-DISTNAME= qtmultimedia-opensource-src-${QTVERSION}
+DISTNAME= qtmultimedia-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtmultimedia-${QTVERSION}
-PKGREVISION= 13
COMMENT= Qt5 module for multimedia
BUILD_TARGET= sub-src
diff --git a/x11/qt5-qtmultimedia/PLIST b/x11/qt5-qtmultimedia/PLIST
index 44027fc855c..77fc3e30cf4 100644
--- a/x11/qt5-qtmultimedia/PLIST
+++ b/x11/qt5-qtmultimedia/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.10 2015/10/26 19:04:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2018/01/17 19:30:47 markd Exp $
lib/pkgconfig/Qt5Multimedia.pc
lib/pkgconfig/Qt5MultimediaQuick_p.pc
lib/pkgconfig/Qt5MultimediaWidgets.pc
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/gstvideoconnector_p.h
-qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/playlistfileparser_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qabstractvideobuffer_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiobuffer_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiodevicefactory_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiohelpers_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qaudiosystempluginext_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qcamera_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdeclarativevideooutput_backend_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qdeclarativevideooutput_p.h
@@ -18,7 +18,6 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudioinput
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudioprobecontrol_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamerbufferprobe_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamerbushelper_p.h
-qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamergltexturerenderer_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermessage_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermirtexturerenderer_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideoinputdevicecontrol_p.h
@@ -28,6 +27,7 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideorende
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideorendererinterface_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideowidget_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideowindow_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgsttools_global_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstutils_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstvideobuffer_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstvideorendererplugin_p.h
@@ -52,11 +52,17 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaservice_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediaserviceprovider_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediastoragelocation_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmemoryvideobuffer_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmultimediautils_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qplaylistfileparser_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsamplecache_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsgvideonode_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsoundeffect_pulse_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qsoundeffect_qaudio_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qtmultimedia-config_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qtmultimediaglobal_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qtmultimediaquickdefs_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideoframe_p.h
+qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideoframeconversionhelper_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideooutputorientationhandler_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideosurfacegstsink_p.h
qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qvideosurfaceoutput_p.h
@@ -82,6 +88,7 @@ qt5/include/QtMultimedia/QAudioOutput
qt5/include/QtMultimedia/QAudioOutputSelectorControl
qt5/include/QtMultimedia/QAudioProbe
qt5/include/QtMultimedia/QAudioRecorder
+qt5/include/QtMultimedia/QAudioRoleControl
qt5/include/QtMultimedia/QAudioSystemFactoryInterface
qt5/include/QtMultimedia/QAudioSystemPlugin
qt5/include/QtMultimedia/QCamera
@@ -176,6 +183,7 @@ qt5/include/QtMultimedia/qaudiooutput.h
qt5/include/QtMultimedia/qaudiooutputselectorcontrol.h
qt5/include/QtMultimedia/qaudioprobe.h
qt5/include/QtMultimedia/qaudiorecorder.h
+qt5/include/QtMultimedia/qaudiorolecontrol.h
qt5/include/QtMultimedia/qaudiosystem.h
qt5/include/QtMultimedia/qaudiosystemplugin.h
qt5/include/QtMultimedia/qcamera.h
@@ -231,7 +239,9 @@ qt5/include/QtMultimedia/qradiotuner.h
qt5/include/QtMultimedia/qradiotunercontrol.h
qt5/include/QtMultimedia/qsound.h
qt5/include/QtMultimedia/qsoundeffect.h
+qt5/include/QtMultimedia/qtmultimedia-config.h
qt5/include/QtMultimedia/qtmultimediadefs.h
+qt5/include/QtMultimedia/qtmultimediaglobal.h
qt5/include/QtMultimedia/qtmultimediaversion.h
qt5/include/QtMultimedia/qvideodeviceselectorcontrol.h
qt5/include/QtMultimedia/qvideoencodersettingscontrol.h
@@ -240,22 +250,19 @@ qt5/include/QtMultimedia/qvideoprobe.h
qt5/include/QtMultimedia/qvideorenderercontrol.h
qt5/include/QtMultimedia/qvideosurfaceformat.h
qt5/include/QtMultimedia/qvideowindowcontrol.h
-qt5/include/QtMultimediaQuick_p/${PKGVERSION}/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h
-qt5/include/QtMultimediaQuick_p/${PKGVERSION}/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h
-qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB
-qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture
-qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_YUV
-qt5/include/QtMultimediaQuick_p/QSGVideoNode_RGB
-qt5/include/QtMultimediaQuick_p/QSGVideoNode_Texture
-qt5/include/QtMultimediaQuick_p/QSGVideoNode_YUV
-qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_p
-qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_pDepends
-qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_pVersion
-qt5/include/QtMultimediaQuick_p/qsgvideonode_rgb.h
-qt5/include/QtMultimediaQuick_p/qsgvideonode_texture.h
-qt5/include/QtMultimediaQuick_p/qsgvideonode_yuv.h
-qt5/include/QtMultimediaQuick_p/qtmultimediaquick_pversion.h
-qt5/include/QtMultimediaWidgets/${PKGVERSION}/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h
+qt5/include/QtMultimediaGstTools/QtMultimediaGstTools
+qt5/include/QtMultimediaGstTools/QtMultimediaGstToolsDepends
+qt5/include/QtMultimediaGstTools/QtMultimediaGstToolsVersion
+qt5/include/QtMultimediaGstTools/qtmultimediagsttoolsversion.h
+qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qdeclarativevideooutput_render_p.h
+qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qdeclarativevideooutput_window_p.h
+qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qsgvideonode_rgb_p.h
+qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qsgvideonode_texture_p.h
+qt5/include/QtMultimediaQuick/${PKGVERSION}/QtMultimediaQuick/private/qsgvideonode_yuv_p.h
+qt5/include/QtMultimediaQuick/QtMultimediaQuick
+qt5/include/QtMultimediaQuick/QtMultimediaQuickDepends
+qt5/include/QtMultimediaQuick/QtMultimediaQuickVersion
+qt5/include/QtMultimediaQuick/qtmultimediaquickversion.h
qt5/include/QtMultimediaWidgets/${PKGVERSION}/QtMultimediaWidgets/private/qpaintervideosurface_p.h
qt5/include/QtMultimediaWidgets/${PKGVERSION}/QtMultimediaWidgets/private/qvideowidget_p.h
qt5/include/QtMultimediaWidgets/QCameraViewfinder
@@ -276,8 +283,8 @@ qt5/lib/cmake/Qt5Multimedia/Qt5MultimediaConfigVersion.cmake
${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AVFMediaPlayerServicePlugin.cmake
${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AVFServicePlugin.cmake
${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_AudioCaptureServicePlugin.cmake
-${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CoreAudioPlugin.cmake
${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake
+${PLIST.mac}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CoreAudioPlugin.cmake
${PLIST.alsa}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QAlsaPlugin.cmake
${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerAudioDecoderServicePlugin.cmake
${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake
@@ -286,37 +293,45 @@ qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QM3uPlaylistPlugin.cmake
${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QPulseAudioPlugin.cmake
qt5/lib/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake
qt5/lib/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfigVersion.cmake
-qt5/lib/libQt5Multimedia.la
qt5/lib/libQt5Multimedia.prl
-qt5/lib/libQt5MultimediaQuick_p.la
-qt5/lib/libQt5MultimediaQuick_p.prl
-qt5/lib/libQt5MultimediaWidgets.la
+qt5/lib/libQt5Multimedia.so
+qt5/lib/libQt5Multimedia.so.${PKGVERSION}
+qt5/lib/libQt5Multimedia.so.5
+qt5/lib/libQt5Multimedia.so.5.10
+qt5/lib/libQt5MultimediaGstTools.prl
+qt5/lib/libQt5MultimediaGstTools.so
+qt5/lib/libQt5MultimediaGstTools.so.${PKGVERSION}
+qt5/lib/libQt5MultimediaGstTools.so.5
+qt5/lib/libQt5MultimediaGstTools.so.5.10
+qt5/lib/libQt5MultimediaQuick.prl
+qt5/lib/libQt5MultimediaQuick.so
+qt5/lib/libQt5MultimediaQuick.so.${PKGVERSION}
+qt5/lib/libQt5MultimediaQuick.so.5
+qt5/lib/libQt5MultimediaQuick.so.5.10
qt5/lib/libQt5MultimediaWidgets.prl
-${PLIST.unix}qt5/lib/libqgsttools_p.la
-${PLIST.unix}qt5/lib/libqgsttools_p.prl
+qt5/lib/libQt5MultimediaWidgets.so
+qt5/lib/libQt5MultimediaWidgets.so.${PKGVERSION}
+qt5/lib/libQt5MultimediaWidgets.so.5
+qt5/lib/libQt5MultimediaWidgets.so.5.10
qt5/lib/pkgconfig/Qt5Multimedia.pc
-qt5/lib/pkgconfig/Qt5MultimediaQuick_p.pc
qt5/lib/pkgconfig/Qt5MultimediaWidgets.pc
qt5/mkspecs/modules/qt_lib_multimedia.pri
qt5/mkspecs/modules/qt_lib_multimedia_private.pri
+qt5/mkspecs/modules/qt_lib_multimediagsttools_private.pri
qt5/mkspecs/modules/qt_lib_multimediawidgets.pri
qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri
qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri
-${PLIST.alsa}qt5/plugins/audio/libqtaudio_alsa.la
-${PLIST.mac}qt5/plugins/audio/libqtaudio_coreaudio.la
-${PLIST.mac}qt5/plugins/mediaservice/libqavfcamera.la
-${PLIST.mac}qt5/plugins/mediaservice/libqavfmediaplayer.la
-${PLIST.mac}qt5/plugins/mediaservice/libqtmedia_audioengine.la
-${PLIST.unix}qt5/plugins/audio/libqtmedia_pulse.la
-${PLIST.unix}qt5/plugins/mediaservice/libgstaudiodecoder.la
-${PLIST.unix}qt5/plugins/mediaservice/libgstcamerabin.la
-${PLIST.unix}qt5/plugins/mediaservice/libgstmediacapture.la
-${PLIST.unix}qt5/plugins/mediaservice/libgstmediaplayer.la
-qt5/plugins/playlistformats/libqtmultimedia_m3u.la
-qt5/qml/QtAudioEngine/libdeclarative_audioengine.la
+${PLIST.alsa}qt5/plugins/audio/libqtaudio_alsa.so
+${PLIST.unix}qt5/plugins/audio/libqtmedia_pulse.so
+${PLIST.unix}qt5/plugins/mediaservice/libgstaudiodecoder.so
+${PLIST.unix}qt5/plugins/mediaservice/libgstcamerabin.so
+${PLIST.unix}qt5/plugins/mediaservice/libgstmediacapture.so
+${PLIST.unix}qt5/plugins/mediaservice/libgstmediaplayer.so
+qt5/plugins/playlistformats/libqtmultimedia_m3u.so
+qt5/qml/QtAudioEngine/libdeclarative_audioengine.so
qt5/qml/QtAudioEngine/plugins.qmltypes
qt5/qml/QtAudioEngine/qmldir
qt5/qml/QtMultimedia/Video.qml
-qt5/qml/QtMultimedia/libdeclarative_multimedia.la
+qt5/qml/QtMultimedia/libdeclarative_multimedia.so
qt5/qml/QtMultimedia/plugins.qmltypes
qt5/qml/QtMultimedia/qmldir
diff --git a/x11/qt5-qtmultimedia/PLIST.Darwin b/x11/qt5-qtmultimedia/PLIST.Darwin
new file mode 100644
index 00000000000..b9e654b19fc
--- /dev/null
+++ b/x11/qt5-qtmultimedia/PLIST.Darwin
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2018/01/17 19:30:47 markd Exp $
+qt5/plugins/audio/libqtaudio_coreaudio.so
+qt5/plugins/mediaservice/libqavfcamera.so
+qt5/plugins/mediaservice/libqavfmediaplayer.so
+qt5/plugins/mediaservice/libqtmedia_audioengine.so
diff --git a/x11/qt5-qtmultimedia/buildlink3.mk b/x11/qt5-qtmultimedia/buildlink3.mk
index 7ffe9df3661..455a749684d 100644
--- a/x11/qt5-qtmultimedia/buildlink3.mk
+++ b/x11/qt5-qtmultimedia/buildlink3.mk
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2018/01/17 19:30:47 markd Exp $
BUILDLINK_TREE+= qt5-qtmultimedia
.if !defined(QT5_QTMULTIMEDIA_BUILDLINK3_MK)
QT5_QTMULTIMEDIA_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.5.1nb13
-BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?= ../../x11/qt5-qtmultimedia
+BUILDLINK_API_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.9.1
+BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?= ../../x11/qt5-qtmultimedia
BUILDLINK_INCDIRS.qt5-qtmultimedia+= qt5/include
BUILDLINK_LIBDIRS.qt5-qtmultimedia+= qt5/lib
diff --git a/x11/qt5-qtmultimedia/distinfo b/x11/qt5-qtmultimedia/distinfo
index 3fb11a0006d..f6036c009c8 100644
--- a/x11/qt5-qtmultimedia/distinfo
+++ b/x11/qt5-qtmultimedia/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.3 2016/07/16 00:37:44 markd Exp $
+$NetBSD: distinfo,v 1.4 2018/01/17 19:30:47 markd Exp $
-SHA1 (qtmultimedia-opensource-src-5.5.1.tar.xz) = 734cdbd0c365ccdf958ad8957e2a8f86492425b7
-RMD160 (qtmultimedia-opensource-src-5.5.1.tar.xz) = 68049da5e203e484de766c17d683a34a888e0603
-SHA512 (qtmultimedia-opensource-src-5.5.1.tar.xz) = e38a3bc0ed77ab6fe7f3a68e2b0dcfebe3fb29c860a1ca48391a1519ebc4c564f25469082b4e9ef78e31093724df24b33aa83158fa9211221fa2c6d9154ce0d0
-Size (qtmultimedia-opensource-src-5.5.1.tar.xz) = 3464340 bytes
-SHA1 (patch-config.tests_alsa_alsatest.cpp) = 8215d32c1bf08610507aea9878a96dfdcbb568b4
-SHA1 (patch-qtmultimedia.pro) = 70ef4ab962f117a7539c352bc5467ae057524a8a
+SHA1 (qtmultimedia-everywhere-src-5.10.0.tar.xz) = 28717fd66e92dbf7f17ad17aab1344d3609111f1
+RMD160 (qtmultimedia-everywhere-src-5.10.0.tar.xz) = ac464e9289e75bb72134f452d1aaf10db7cfd316
+SHA512 (qtmultimedia-everywhere-src-5.10.0.tar.xz) = 43838d5d09728388d8a4e62aeaea242479b76a1fbe31afbf9260538135e37b15114ef29e13bcd1c7698b0798161e740f79606abf9a475f39f77da379e7b0e98f
+Size (qtmultimedia-everywhere-src-5.10.0.tar.xz) = 3654312 bytes
diff --git a/x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp b/x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp
deleted file mode 100644
index 500d611d34b..00000000000
--- a/x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-config.tests_alsa_alsatest.cpp,v 1.1 2016/07/16 00:37:45 markd Exp $
-
-Allow newer Alsa versions.
-
---- config.tests/alsa/alsatest.cpp.orig 2015-10-13 04:35:43.000000000 +0000
-+++ config.tests/alsa/alsatest.cpp
-@@ -32,7 +32,7 @@
- ****************************************************************************/
-
- #include <alsa/asoundlib.h>
--#if (!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
-+#if (!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10) && !(SND_LIB_MAJOR == 1 && SND_LIB_MINOR >= 1))
- #error "Alsa version found too old, require >= 1.0.10"
- #endif
-
diff --git a/x11/qt5-qtmultimedia/patches/patch-qtmultimedia.pro b/x11/qt5-qtmultimedia/patches/patch-qtmultimedia.pro
deleted file mode 100644
index abddb568a56..00000000000
--- a/x11/qt5-qtmultimedia/patches/patch-qtmultimedia.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-qtmultimedia.pro,v 1.1 2015/10/26 19:04:00 adam Exp $
-
-Try to configure audio modules, despite QT_CONFIG set in qt5-qtbase.
-
---- qtmultimedia.pro.orig 2015-10-26 17:52:59.000000000 +0000
-+++ qtmultimedia.pro
-@@ -15,16 +15,10 @@ win32 {
- } else:qnx {
- qtCompileTest(mmrenderer)
- } else:!android {
-- contains(QT_CONFIG, alsa):qtCompileTest(alsa)
-- contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio)
-+ qtCompileTest(alsa)
-+ qtCompileTest(pulseaudio)
-
-- isEmpty(GST_VERSION) {
-- contains(QT_CONFIG, gstreamer-0.10) {
-- GST_VERSION = 0.10
-- } else: contains(QT_CONFIG, gstreamer-1.0) {
-- GST_VERSION = 1.0
-- }
-- }
-+ GST_VERSION = 1.0
- cache(GST_VERSION, set)
- !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
- qtCompileTest(gstreamer_photography)
diff --git a/x11/qt5-qtquickcontrols/Makefile b/x11/qt5-qtquickcontrols/Makefile
index df85542be5d..0c1a93a71c3 100644
--- a/x11/qt5-qtquickcontrols/Makefile
+++ b/x11/qt5-qtquickcontrols/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.22 2018/01/17 19:30:48 markd Exp $
-DISTNAME= qtquickcontrols-opensource-src-${QTVERSION}
+DISTNAME= qtquickcontrols-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtquickcontrols-${QTVERSION}
-PKGREVISION= 9
COMMENT= Qt5 module for QuickControls
BUILD_TARGET= sub-src
diff --git a/x11/qt5-qtquickcontrols/PLIST b/x11/qt5-qtquickcontrols/PLIST
index 78419755c8b..1a48c9656a1 100644
--- a/x11/qt5-qtquickcontrols/PLIST
+++ b/x11/qt5-qtquickcontrols/PLIST
@@ -1,97 +1,187 @@
-@comment $NetBSD: PLIST,v 1.3 2015/10/26 19:04:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/01/17 19:30:48 markd Exp $
qt5/qml/QtQuick/Controls/ApplicationWindow.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/ApplicationWindow.qmlc
qt5/qml/QtQuick/Controls/BusyIndicator.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/BusyIndicator.qmlc
qt5/qml/QtQuick/Controls/Button.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Button.qmlc
qt5/qml/QtQuick/Controls/Calendar.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Calendar.qmlc
qt5/qml/QtQuick/Controls/CheckBox.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/CheckBox.qmlc
qt5/qml/QtQuick/Controls/ComboBox.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/ComboBox.qmlc
qt5/qml/QtQuick/Controls/GroupBox.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/GroupBox.qmlc
qt5/qml/QtQuick/Controls/Label.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Label.qmlc
qt5/qml/QtQuick/Controls/Menu.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Menu.qmlc
qt5/qml/QtQuick/Controls/MenuBar.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/MenuBar.qmlc
qt5/qml/QtQuick/Controls/Private/AbstractCheckable.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/AbstractCheckable.qmlc
qt5/qml/QtQuick/Controls/Private/BasicButton.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/BasicButton.qmlc
qt5/qml/QtQuick/Controls/Private/BasicTableView.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/BasicTableView.qmlc
qt5/qml/QtQuick/Controls/Private/CalendarHeaderModel.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/CalendarHeaderModel.qmlc
qt5/qml/QtQuick/Controls/Private/CalendarUtils.js
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/CalendarUtils.jsc
qt5/qml/QtQuick/Controls/Private/ColumnMenuContent.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/ColumnMenuContent.qmlc
qt5/qml/QtQuick/Controls/Private/ContentItem.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/ContentItem.qmlc
qt5/qml/QtQuick/Controls/Private/Control.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/Control.qmlc
qt5/qml/QtQuick/Controls/Private/EditMenu.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/EditMenu.qmlc
qt5/qml/QtQuick/Controls/Private/EditMenu_base.qml
-qt5/qml/QtQuick/Controls/Private/EditMenu_ios.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/EditMenu_base.qmlc
qt5/qml/QtQuick/Controls/Private/FastGlow.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/FastGlow.qmlc
qt5/qml/QtQuick/Controls/Private/FocusFrame.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/FocusFrame.qmlc
qt5/qml/QtQuick/Controls/Private/HoverButton.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/HoverButton.qmlc
qt5/qml/QtQuick/Controls/Private/MenuContentItem.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/MenuContentItem.qmlc
qt5/qml/QtQuick/Controls/Private/MenuContentScroller.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/MenuContentScroller.qmlc
qt5/qml/QtQuick/Controls/Private/MenuItemSubControls.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/MenuItemSubControls.qmlc
qt5/qml/QtQuick/Controls/Private/ModalPopupBehavior.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/ModalPopupBehavior.qmlc
qt5/qml/QtQuick/Controls/Private/ScrollBar.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/ScrollBar.qmlc
qt5/qml/QtQuick/Controls/Private/ScrollViewHelper.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/ScrollViewHelper.qmlc
qt5/qml/QtQuick/Controls/Private/SourceProxy.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/SourceProxy.qmlc
qt5/qml/QtQuick/Controls/Private/StackView.js
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/StackView.jsc
qt5/qml/QtQuick/Controls/Private/StackViewSlideDelegate.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/StackViewSlideDelegate.qmlc
qt5/qml/QtQuick/Controls/Private/Style.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/Style.qmlc
qt5/qml/QtQuick/Controls/Private/SystemPaletteSingleton.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/SystemPaletteSingleton.qmlc
qt5/qml/QtQuick/Controls/Private/TabBar.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/TabBar.qmlc
qt5/qml/QtQuick/Controls/Private/TableViewItemDelegateLoader.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/TableViewItemDelegateLoader.qmlc
qt5/qml/QtQuick/Controls/Private/TableViewSelection.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/TableViewSelection.qmlc
qt5/qml/QtQuick/Controls/Private/TextHandle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/TextHandle.qmlc
qt5/qml/QtQuick/Controls/Private/TextInputWithHandles.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/TextInputWithHandles.qmlc
qt5/qml/QtQuick/Controls/Private/TextSingleton.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/TextSingleton.qmlc
qt5/qml/QtQuick/Controls/Private/ToolMenuButton.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/ToolMenuButton.qmlc
qt5/qml/QtQuick/Controls/Private/TreeViewItemDelegateLoader.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/TreeViewItemDelegateLoader.qmlc
qt5/qml/QtQuick/Controls/Private/qmldir
qt5/qml/QtQuick/Controls/Private/style.js
+${PLIST.jit}qt5/qml/QtQuick/Controls/Private/style.jsc
qt5/qml/QtQuick/Controls/ProgressBar.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/ProgressBar.qmlc
qt5/qml/QtQuick/Controls/RadioButton.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/RadioButton.qmlc
qt5/qml/QtQuick/Controls/ScrollView.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/ScrollView.qmlc
qt5/qml/QtQuick/Controls/Slider.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Slider.qmlc
qt5/qml/QtQuick/Controls/SpinBox.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/SpinBox.qmlc
qt5/qml/QtQuick/Controls/SplitView.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/SplitView.qmlc
qt5/qml/QtQuick/Controls/StackView.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/StackView.qmlc
qt5/qml/QtQuick/Controls/StackViewDelegate.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/StackViewDelegate.qmlc
qt5/qml/QtQuick/Controls/StackViewTransition.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/StackViewTransition.qmlc
qt5/qml/QtQuick/Controls/StatusBar.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/StatusBar.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/ApplicationWindowStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/ApplicationWindowStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/BasicTableViewStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/BasicTableViewStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/BusyIndicatorStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/BusyIndicatorStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/ButtonStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/ButtonStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/CalendarStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/CalendarStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/CheckBoxStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/CheckBoxStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/CircularButtonStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/CircularButtonStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/CircularGaugeStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/CircularGaugeStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/CircularTickmarkLabelStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/CircularTickmarkLabelStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/ComboBoxStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/ComboBoxStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/CommonStyleHelper.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/CommonStyleHelper.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/DelayButtonStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/DelayButtonStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/DialStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/DialStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/FocusFrameStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/FocusFrameStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/GaugeStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/GaugeStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/GroupBoxStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/GroupBoxStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/HandleStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/HandleStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/HandleStyleHelper.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/HandleStyleHelper.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/MenuBarStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/MenuBarStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/MenuStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/MenuStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/PieMenuStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/PieMenuStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/ProgressBarStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/ProgressBarStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/RadioButtonStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/RadioButtonStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/ScrollViewStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/ScrollViewStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/SliderStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/SliderStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/SpinBoxStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/SpinBoxStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/StatusBarStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/StatusBarStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/StatusIndicatorStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/StatusIndicatorStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/SwitchStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/SwitchStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/TabViewStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/TabViewStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/TableViewStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/TableViewStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/TextAreaStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/TextAreaStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/TextFieldStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/TextFieldStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/ToggleButtonStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/ToggleButtonStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/ToolBarStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/ToolBarStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/ToolButtonStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/ToolButtonStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/TreeViewStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/TreeViewStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/TumblerStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Base/TumblerStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Base/images/arrow-down.png
qt5/qml/QtQuick/Controls/Styles/Base/images/arrow-down@2x.png
qt5/qml/QtQuick/Controls/Styles/Base/images/arrow-left.png
@@ -124,60 +214,174 @@ qt5/qml/QtQuick/Controls/Styles/Base/images/spinner_small.png
qt5/qml/QtQuick/Controls/Styles/Base/images/tab.png
qt5/qml/QtQuick/Controls/Styles/Base/images/tab_selected.png
qt5/qml/QtQuick/Controls/Styles/Desktop/ApplicationWindowStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/ApplicationWindowStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/BusyIndicatorStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/BusyIndicatorStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/ButtonStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/ButtonStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/CalendarStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/CalendarStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/CheckBoxStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/CheckBoxStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/ComboBoxStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/ComboBoxStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/FocusFrameStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/FocusFrameStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/GroupBoxStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/GroupBoxStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/MenuBarStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/MenuBarStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/MenuStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/MenuStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/ProgressBarStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/ProgressBarStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/RadioButtonStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/RadioButtonStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/RowItemSingleton.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/RowItemSingleton.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/ScrollViewStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/ScrollViewStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/SliderStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/SliderStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/SpinBoxStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/SpinBoxStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/StatusBarStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/StatusBarStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/SwitchStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/SwitchStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/TabViewStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/TabViewStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/TableViewStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/TableViewStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/TextAreaStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/TextAreaStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/TextFieldStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/TextFieldStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/ToolBarStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/ToolBarStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/ToolButtonStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/ToolButtonStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/TreeViewStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Styles/Desktop/TreeViewStyle.qmlc
qt5/qml/QtQuick/Controls/Styles/Desktop/qmldir
-qt5/qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.la
+qt5/qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so
qt5/qml/QtQuick/Controls/Styles/Flat/qmldir
qt5/qml/QtQuick/Controls/Styles/qmldir
qt5/qml/QtQuick/Controls/Switch.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Switch.qmlc
qt5/qml/QtQuick/Controls/Tab.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/Tab.qmlc
qt5/qml/QtQuick/Controls/TabView.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/TabView.qmlc
qt5/qml/QtQuick/Controls/TableView.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/TableView.qmlc
qt5/qml/QtQuick/Controls/TableViewColumn.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/TableViewColumn.qmlc
qt5/qml/QtQuick/Controls/TextArea.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/TextArea.qmlc
qt5/qml/QtQuick/Controls/TextField.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/TextField.qmlc
qt5/qml/QtQuick/Controls/ToolBar.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/ToolBar.qmlc
qt5/qml/QtQuick/Controls/ToolButton.qml
+${PLIST.jit}qt5/qml/QtQuick/Controls/ToolButton.qmlc
qt5/qml/QtQuick/Controls/TreeView.qml
-qt5/qml/QtQuick/Controls/libqtquickcontrolsplugin.la
+${PLIST.jit}qt5/qml/QtQuick/Controls/TreeView.qmlc
+qt5/qml/QtQuick/Controls/libqtquickcontrolsplugin.so
qt5/qml/QtQuick/Controls/plugins.qmltypes
qt5/qml/QtQuick/Controls/qmldir
-qt5/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.la
+qt5/qml/QtQuick/Dialogs/DefaultColorDialog.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/DefaultColorDialog.qmlc
+qt5/qml/QtQuick/Dialogs/DefaultDialogWrapper.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/DefaultDialogWrapper.qmlc
+qt5/qml/QtQuick/Dialogs/DefaultFileDialog.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/DefaultFileDialog.qmlc
+qt5/qml/QtQuick/Dialogs/DefaultFontDialog.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/DefaultFontDialog.qmlc
+qt5/qml/QtQuick/Dialogs/DefaultMessageDialog.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/DefaultMessageDialog.qmlc
+qt5/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so
+qt5/qml/QtQuick/Dialogs/Private/plugins.qmltypes
qt5/qml/QtQuick/Dialogs/Private/qmldir
-qt5/qml/QtQuick/Dialogs/libdialogplugin.la
+qt5/qml/QtQuick/Dialogs/WidgetColorDialog.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/WidgetColorDialog.qmlc
+qt5/qml/QtQuick/Dialogs/WidgetFileDialog.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/WidgetFileDialog.qmlc
+qt5/qml/QtQuick/Dialogs/WidgetFontDialog.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/WidgetFontDialog.qmlc
+qt5/qml/QtQuick/Dialogs/WidgetMessageDialog.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/WidgetMessageDialog.qmlc
+qt5/qml/QtQuick/Dialogs/images/checkers.png
+qt5/qml/QtQuick/Dialogs/images/checkmark.png
+qt5/qml/QtQuick/Dialogs/images/copy.png
+qt5/qml/QtQuick/Dialogs/images/critical.png
+qt5/qml/QtQuick/Dialogs/images/crosshairs.png
+qt5/qml/QtQuick/Dialogs/images/information.png
+qt5/qml/QtQuick/Dialogs/images/question.png
+qt5/qml/QtQuick/Dialogs/images/slider_handle.png
+qt5/qml/QtQuick/Dialogs/images/sunken_frame.png
+qt5/qml/QtQuick/Dialogs/images/warning.png
+qt5/qml/QtQuick/Dialogs/images/window_border.png
+qt5/qml/QtQuick/Dialogs/libdialogplugin.so
qt5/qml/QtQuick/Dialogs/plugins.qmltypes
+qt5/qml/QtQuick/Dialogs/qml/ColorSlider.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/qml/ColorSlider.qmlc
+qt5/qml/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/qml/DefaultWindowDecoration.qmlc
+qt5/qml/QtQuick/Dialogs/qml/IconButtonStyle.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/qml/IconButtonStyle.qmlc
+qt5/qml/QtQuick/Dialogs/qml/IconGlyph.qml
+${PLIST.jit}qt5/qml/QtQuick/Dialogs/qml/IconGlyph.qmlc
+qt5/qml/QtQuick/Dialogs/qml/icons.ttf
+qt5/qml/QtQuick/Dialogs/qml/qmldir
qt5/qml/QtQuick/Dialogs/qmldir
+qt5/qml/QtQuick/Extras/CircularGauge.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/CircularGauge.qmlc
+qt5/qml/QtQuick/Extras/DelayButton.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/DelayButton.qmlc
+qt5/qml/QtQuick/Extras/Dial.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/Dial.qmlc
+qt5/qml/QtQuick/Extras/Gauge.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/Gauge.qmlc
+qt5/qml/QtQuick/Extras/PieMenu.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/PieMenu.qmlc
+qt5/qml/QtQuick/Extras/Private/CircularButton.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/Private/CircularButton.qmlc
+qt5/qml/QtQuick/Extras/Private/CircularButtonStyleHelper.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/Private/CircularButtonStyleHelper.qmlc
+qt5/qml/QtQuick/Extras/Private/CircularTickmarkLabel.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/Private/CircularTickmarkLabel.qmlc
+qt5/qml/QtQuick/Extras/Private/Handle.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/Private/Handle.qmlc
+qt5/qml/QtQuick/Extras/Private/PieMenuIcon.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/Private/PieMenuIcon.qmlc
+qt5/qml/QtQuick/Extras/Private/TextSingleton.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/Private/TextSingleton.qmlc
+qt5/qml/QtQuick/Extras/Private/qmldir
+qt5/qml/QtQuick/Extras/StatusIndicator.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/StatusIndicator.qmlc
+qt5/qml/QtQuick/Extras/ToggleButton.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/ToggleButton.qmlc
+qt5/qml/QtQuick/Extras/Tumbler.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/Tumbler.qmlc
+qt5/qml/QtQuick/Extras/TumblerColumn.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/TumblerColumn.qmlc
qt5/qml/QtQuick/Extras/designer/CircularGaugeSpecifics.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/designer/CircularGaugeSpecifics.qmlc
qt5/qml/QtQuick/Extras/designer/DelayButtonSpecifics.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/designer/DelayButtonSpecifics.qmlc
qt5/qml/QtQuick/Extras/designer/DialSpecifics.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/designer/DialSpecifics.qmlc
qt5/qml/QtQuick/Extras/designer/GaugeSpecifics.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/designer/GaugeSpecifics.qmlc
qt5/qml/QtQuick/Extras/designer/PictureSpecifics.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/designer/PictureSpecifics.qmlc
qt5/qml/QtQuick/Extras/designer/PieMenuSpecifics.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/designer/PieMenuSpecifics.qmlc
qt5/qml/QtQuick/Extras/designer/StatusIndicatorSpecifics.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/designer/StatusIndicatorSpecifics.qmlc
qt5/qml/QtQuick/Extras/designer/ToggleButtonSpecifics.qml
+${PLIST.jit}qt5/qml/QtQuick/Extras/designer/ToggleButtonSpecifics.qmlc
qt5/qml/QtQuick/Extras/designer/images/circulargauge-icon.png
qt5/qml/QtQuick/Extras/designer/images/circulargauge-icon16.png
qt5/qml/QtQuick/Extras/designer/images/delaybutton-icon.png
@@ -197,12 +401,9 @@ qt5/qml/QtQuick/Extras/designer/images/togglebutton-icon16.png
qt5/qml/QtQuick/Extras/designer/images/tumbler-icon.png
qt5/qml/QtQuick/Extras/designer/images/tumbler-icon16.png
qt5/qml/QtQuick/Extras/designer/qtquickextras.metainfo
-qt5/qml/QtQuick/Extras/libqtquickextrasplugin.la
+qt5/qml/QtQuick/Extras/libqtquickextrasplugin.so
qt5/qml/QtQuick/Extras/plugins.qmltypes
qt5/qml/QtQuick/Extras/qmldir
-qt5/qml/QtQuick/Layouts/libqquicklayoutsplugin.la
-qt5/qml/QtQuick/Layouts/plugins.qmltypes
-qt5/qml/QtQuick/Layouts/qmldir
-qt5/qml/QtQuick/PrivateWidgets/libwidgetsplugin.la
+qt5/qml/QtQuick/PrivateWidgets/libwidgetsplugin.so
qt5/qml/QtQuick/PrivateWidgets/plugins.qmltypes
qt5/qml/QtQuick/PrivateWidgets/qmldir
diff --git a/x11/qt5-qtquickcontrols/buildlink3.mk b/x11/qt5-qtquickcontrols/buildlink3.mk
index b7824961cf6..110849ccc7a 100644
--- a/x11/qt5-qtquickcontrols/buildlink3.mk
+++ b/x11/qt5-qtquickcontrols/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.18 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/17 19:30:48 markd Exp $
BUILDLINK_TREE+= qt5-qtquickcontrols
.if !defined(QT5_QTQUICKCONTROLS_BUILDLINK3_MK)
QT5_QTQUICKCONTROLS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtquickcontrols+= qt5-qtquickcontrols>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtquickcontrols+= qt5-qtquickcontrols>=5.5.1nb9
+BUILDLINK_API_DEPENDS.qt5-qtquickcontrols+= qt5-qtquickcontrols>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtquickcontrols+= qt5-qtquickcontrols>=5.9.1
BUILDLINK_PKGSRCDIR.qt5-qtquickcontrols?= ../../x11/qt5-qtquickcontrols
BUILDLINK_INCDIRS.qt5-qtquickcontrols+= qt5/include
diff --git a/x11/qt5-qtquickcontrols/distinfo b/x11/qt5-qtquickcontrols/distinfo
index 7a77a51b16e..2f960d45b36 100644
--- a/x11/qt5-qtquickcontrols/distinfo
+++ b/x11/qt5-qtquickcontrols/distinfo
@@ -1,6 +1,6 @@
-$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 (qtquickcontrols-opensource-src-5.5.1.tar.xz) = 1a44136fdc925590d74a290d766a730d3e549fef
-RMD160 (qtquickcontrols-opensource-src-5.5.1.tar.xz) = 3975fbb34a74d55f88f47b436b6fca6ce3f7c078
-SHA512 (qtquickcontrols-opensource-src-5.5.1.tar.xz) = 7abe85f44cb6785bcbb6d8150cd1033e61871fb585a7c19644b51a8951668c937ef7fcdfaf57b008ded525b8f150a0dc6a35f1dc31f5b30c6125179ba67540f2
-Size (qtquickcontrols-opensource-src-5.5.1.tar.xz) = 5976316 bytes
+SHA1 (qtquickcontrols-everywhere-src-5.10.0.tar.xz) = 062509f58a3cf88604fce794c05c7131199e9002
+RMD160 (qtquickcontrols-everywhere-src-5.10.0.tar.xz) = 07b91a62f8887d2007c1432937e1d3d01f7a1da0
+SHA512 (qtquickcontrols-everywhere-src-5.10.0.tar.xz) = 87824d4802581710d6dc23f09c661aaff470a4050ada42be5b75ae88279a50782564a0f7feef059fdce5d50992438ec59417ff42e9258d890d7624855f0d7b70
+Size (qtquickcontrols-everywhere-src-5.10.0.tar.xz) = 5966860 bytes
diff --git a/x11/qt5-qtscript/Makefile b/x11/qt5-qtscript/Makefile
index 40d54d77415..0a93d150b72 100644
--- a/x11/qt5-qtscript/Makefile
+++ b/x11/qt5-qtscript/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.32 2018/01/17 19:30:48 markd Exp $
-DISTNAME= qtscript-opensource-src-${QTVERSION}
+DISTNAME= qtscript-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtscript-${QTVERSION}
-PKGREVISION= 15
COMMENT= Qt5 module for script
BUILD_TARGET= sub-src
diff --git a/x11/qt5-qtscript/PLIST b/x11/qt5-qtscript/PLIST
index 2e52dc7b5be..bdca6c3b9ab 100644
--- a/x11/qt5-qtscript/PLIST
+++ b/x11/qt5-qtscript/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/12/15 09:42:44 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/01/17 19:30:48 markd Exp $
lib/pkgconfig/Qt5Script.pc
lib/pkgconfig/Qt5ScriptTools.pc
qt5/include/QtScript/${PKGVERSION}/QtScript/private/qscriptable_p.h
@@ -153,10 +153,16 @@ qt5/lib/cmake/Qt5Script/Qt5ScriptConfig.cmake
qt5/lib/cmake/Qt5Script/Qt5ScriptConfigVersion.cmake
qt5/lib/cmake/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake
qt5/lib/cmake/Qt5ScriptTools/Qt5ScriptToolsConfigVersion.cmake
-qt5/lib/libQt5Script.la
qt5/lib/libQt5Script.prl
-qt5/lib/libQt5ScriptTools.la
+qt5/lib/libQt5Script.so
+qt5/lib/libQt5Script.so.5
+qt5/lib/libQt5Script.so.5.10
+qt5/lib/libQt5Script.so.${PKGVERSION}
qt5/lib/libQt5ScriptTools.prl
+qt5/lib/libQt5ScriptTools.so
+qt5/lib/libQt5ScriptTools.so.5
+qt5/lib/libQt5ScriptTools.so.5.10
+qt5/lib/libQt5ScriptTools.so.${PKGVERSION}
qt5/lib/pkgconfig/Qt5Script.pc
qt5/lib/pkgconfig/Qt5ScriptTools.pc
qt5/mkspecs/modules/qt_lib_script.pri
diff --git a/x11/qt5-qtscript/buildlink3.mk b/x11/qt5-qtscript/buildlink3.mk
index e080342dcf1..739e18b8586 100644
--- a/x11/qt5-qtscript/buildlink3.mk
+++ b/x11/qt5-qtscript/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.23 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2018/01/17 19:30:48 markd Exp $
BUILDLINK_TREE+= qt5-qtscript
.if !defined(QT5_QTSCRIPT_BUILDLINK3_MK)
QT5_QTSCRIPT_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtscript+= qt5-qtscript>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtscript+= qt5-qtscript>=5.5.1nb15
+BUILDLINK_API_DEPENDS.qt5-qtscript+= qt5-qtscript>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtscript+= qt5-qtscript>=5.9.1
BUILDLINK_PKGSRCDIR.qt5-qtscript?= ../../x11/qt5-qtscript
BUILDLINK_INCDIRS.qt5-qtscript+= qt5/include
diff --git a/x11/qt5-qtscript/distinfo b/x11/qt5-qtscript/distinfo
index 9196baf9243..4473a4e69c1 100644
--- a/x11/qt5-qtscript/distinfo
+++ b/x11/qt5-qtscript/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2015/10/26 19:04:00 adam Exp $
+$NetBSD: distinfo,v 1.4 2018/01/17 19:30:48 markd Exp $
-SHA1 (qtscript-opensource-src-5.5.1.tar.xz) = e5bb071c43e9c1244d779383c9c72fe0f0564578
-RMD160 (qtscript-opensource-src-5.5.1.tar.xz) = 7d8ff8c4462b21b83212dd780030a01bd00b8ca9
-SHA512 (qtscript-opensource-src-5.5.1.tar.xz) = a520e8593100153b41b9a88ad02afa5b46b743a3662914dc84225475fad1d5189f75ecc84970e26f9291693dc7461417cd9193c9f8e22d3cc4c9e2cc1d0e2371
-Size (qtscript-opensource-src-5.5.1.tar.xz) = 2604884 bytes
+SHA1 (qtscript-everywhere-src-5.10.0.tar.xz) = 3540d0174704d5d72f2b8fc5bd656584363d1232
+RMD160 (qtscript-everywhere-src-5.10.0.tar.xz) = 697b731696cefc883e4fe8db75baa1e4ab358fe0
+SHA512 (qtscript-everywhere-src-5.10.0.tar.xz) = 4991ad27e6c3580682475f36684176783ba7564a9dfd65d5ff5087460998fbba5f1a7162b967b5945c91bea63c33e808b7f1fce51a5df36849252b1ded59e5bd
+Size (qtscript-everywhere-src-5.10.0.tar.xz) = 2659408 bytes
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h) = e46033a23803b4e27dcd7f5369730e046ad5e4cb
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h) = 6672e941f0ecbba35b5b932ab9f7b49a269fb6e6
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h) = 5467afc8dc5e2f93a267a6ab380bb647c501d145
diff --git a/x11/qt5-qtsensors/Makefile b/x11/qt5-qtsensors/Makefile
index 041ebb856ff..4198ac54ffe 100644
--- a/x11/qt5-qtsensors/Makefile
+++ b/x11/qt5-qtsensors/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.23 2018/01/17 19:30:48 markd Exp $
-DISTNAME= qtsensors-opensource-src-${QTVERSION}
+DISTNAME= qtsensors-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtsensors-${QTVERSION}
-PKGREVISION= 9
COMMENT= Qt5 module for Sensors
BUILD_TARGET= sub-src
diff --git a/x11/qt5-qtsensors/PLIST b/x11/qt5-qtsensors/PLIST
index 16c3eced0ff..260ce3302ab 100644
--- a/x11/qt5-qtsensors/PLIST
+++ b/x11/qt5-qtsensors/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/10/26 19:04:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/01/17 19:30:48 markd Exp $
lib/pkgconfig/Qt5Sensors.pc
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qaccelerometer_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qaltimeter_p.h
@@ -8,7 +8,9 @@ qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qcompass_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qdistancesensor_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qgyroscope_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qholstersensor_p.h
+qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qhumiditysensor_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qirproximitysensor_p.h
+qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qlidsensor_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qlightsensor_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qmagnetometer_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qorientationsensor_p.h
@@ -21,6 +23,7 @@ qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qsensorgesture_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qsensorgesturemanagerprivate_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qtapsensor_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qtiltsensor_p.h
+qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qtsensors-config_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/sensorlog_p.h
qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/simulatorgesturescommon_p.h
qt5/include/QtSensors/QAccelerometer
@@ -47,9 +50,15 @@ qt5/include/QtSensors/QGyroscopeReading
qt5/include/QtSensors/QHolsterFilter
qt5/include/QtSensors/QHolsterReading
qt5/include/QtSensors/QHolsterSensor
+qt5/include/QtSensors/QHumidityFilter
+qt5/include/QtSensors/QHumidityReading
+qt5/include/QtSensors/QHumiditySensor
qt5/include/QtSensors/QIRProximityFilter
qt5/include/QtSensors/QIRProximityReading
qt5/include/QtSensors/QIRProximitySensor
+qt5/include/QtSensors/QLidFilter
+qt5/include/QtSensors/QLidReading
+qt5/include/QtSensors/QLidSensor
qt5/include/QtSensors/QLightFilter
qt5/include/QtSensors/QLightReading
qt5/include/QtSensors/QLightSensor
@@ -97,7 +106,9 @@ qt5/include/QtSensors/qcompass.h
qt5/include/QtSensors/qdistancesensor.h
qt5/include/QtSensors/qgyroscope.h
qt5/include/QtSensors/qholstersensor.h
+qt5/include/QtSensors/qhumiditysensor.h
qt5/include/QtSensors/qirproximitysensor.h
+qt5/include/QtSensors/qlidsensor.h
qt5/include/QtSensors/qlightsensor.h
qt5/include/QtSensors/qmagnetometer.h
qt5/include/QtSensors/qorientationsensor.h
@@ -115,20 +126,24 @@ qt5/include/QtSensors/qsensorplugin.h
qt5/include/QtSensors/qsensorsglobal.h
qt5/include/QtSensors/qtapsensor.h
qt5/include/QtSensors/qtiltsensor.h
+qt5/include/QtSensors/qtsensors-config.h
qt5/include/QtSensors/qtsensorsversion.h
qt5/lib/cmake/Qt5Sensors/Qt5SensorsConfig.cmake
qt5/lib/cmake/Qt5Sensors/Qt5SensorsConfigVersion.cmake
qt5/lib/cmake/Qt5Sensors/Qt5Sensors_QShakeSensorGesturePlugin.cmake
qt5/lib/cmake/Qt5Sensors/Qt5Sensors_QtSensorGesturePlugin.cmake
qt5/lib/cmake/Qt5Sensors/Qt5Sensors_genericSensorPlugin.cmake
-qt5/lib/libQt5Sensors.la
qt5/lib/libQt5Sensors.prl
+qt5/lib/libQt5Sensors.so
+qt5/lib/libQt5Sensors.so.5
+qt5/lib/libQt5Sensors.so.5.10
+qt5/lib/libQt5Sensors.so.${PKGVERSION}
qt5/lib/pkgconfig/Qt5Sensors.pc
qt5/mkspecs/modules/qt_lib_sensors.pri
qt5/mkspecs/modules/qt_lib_sensors_private.pri
-qt5/plugins/sensorgestures/libqtsensorgestures_plugin.la
-qt5/plugins/sensorgestures/libqtsensorgestures_shakeplugin.la
-qt5/plugins/sensors/libqtsensors_generic.la
-qt5/qml/QtSensors/libdeclarative_sensors.la
+qt5/plugins/sensorgestures/libqtsensorgestures_plugin.so
+qt5/plugins/sensorgestures/libqtsensorgestures_shakeplugin.so
+qt5/plugins/sensors/libqtsensors_generic.so
+qt5/qml/QtSensors/libdeclarative_sensors.so
qt5/qml/QtSensors/plugins.qmltypes
qt5/qml/QtSensors/qmldir
diff --git a/x11/qt5-qtsensors/PLIST.Darwin b/x11/qt5-qtsensors/PLIST.Darwin
new file mode 100644
index 00000000000..c5475ab5827
--- /dev/null
+++ b/x11/qt5-qtsensors/PLIST.Darwin
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2018/01/17 19:30:48 markd Exp $
+qt5/lib/cmake/Qt5Sensors/Qt5Sensors_IOSSensorPlugin.cmake
+qt5/plugins/sensors/libqtsensors_ios.so
diff --git a/x11/qt5-qtsensors/buildlink3.mk b/x11/qt5-qtsensors/buildlink3.mk
index 94af9816fe5..9117db1b684 100644
--- a/x11/qt5-qtsensors/buildlink3.mk
+++ b/x11/qt5-qtsensors/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.18 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/17 19:30:48 markd Exp $
BUILDLINK_TREE+= qt5-qtsensors
.if !defined(QT5_QTSENSORS_BUILDLINK3_MK)
QT5_QTSENSORS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtsensors+= qt5-qtsensors>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtsensors+= qt5-qtsensors>=5.5.1nb9
+BUILDLINK_API_DEPENDS.qt5-qtsensors+= qt5-qtsensors>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtsensors+= qt5-qtsensors>=5.9.1
BUILDLINK_PKGSRCDIR.qt5-qtsensors?= ../../x11/qt5-qtsensors
BUILDLINK_INCDIRS.qt5-qtsensors+= qt5/include
diff --git a/x11/qt5-qtsensors/distinfo b/x11/qt5-qtsensors/distinfo
index 02632c11cda..a81f5a9a176 100644
--- a/x11/qt5-qtsensors/distinfo
+++ b/x11/qt5-qtsensors/distinfo
@@ -1,6 +1,6 @@
-$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 (qtsensors-opensource-src-5.5.1.tar.xz) = 12ea8c4df0bab03f2d8ef079ccfc04367c8ac94d
-RMD160 (qtsensors-opensource-src-5.5.1.tar.xz) = 9a3eaad761efaefc0a56258c0bd64e01d0889cba
-SHA512 (qtsensors-opensource-src-5.5.1.tar.xz) = a73cc4aa954e494cf27a17fdd9017b8c4386ab1b0bd2a259176db7a4b4fa1b3c5a3ec11ac65277bab16bff3bd751a7109098fa372965b3b935e165967c1c2049
-Size (qtsensors-opensource-src-5.5.1.tar.xz) = 1989556 bytes
+SHA1 (qtsensors-everywhere-src-5.10.0.tar.xz) = a8e6b00851f2061192cbd34216bde7adde0271e6
+RMD160 (qtsensors-everywhere-src-5.10.0.tar.xz) = 540ffd9cc3e87748a30983be9cb27432227eb838
+SHA512 (qtsensors-everywhere-src-5.10.0.tar.xz) = 4cffe6ee7a30dd3ba992648d28a2558e4084326828511a7afd18085a86aad42c6228da2fe19398d04db5943a812d5233d2ff705ab5a3fe3ab9d1170f8a53ee6d
+Size (qtsensors-everywhere-src-5.10.0.tar.xz) = 2015352 bytes
diff --git a/x11/qt5-qtserialport/Makefile b/x11/qt5-qtserialport/Makefile
index 0567c69642e..ae58729fb04 100644
--- a/x11/qt5-qtserialport/Makefile
+++ b/x11/qt5-qtserialport/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.22 2018/01/17 19:30:48 markd Exp $
-DISTNAME= qtserialport-opensource-src-${QTVERSION}
+DISTNAME= qtserialport-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtserialport-${QTVERSION}
-PKGREVISION= 9
COMMENT= Qt5 module for Serial Port
BUILD_TARGET= sub-src
diff --git a/x11/qt5-qtserialport/PLIST b/x11/qt5-qtserialport/PLIST
index 8d141dc34af..5dcd18ed2c5 100644
--- a/x11/qt5-qtserialport/PLIST
+++ b/x11/qt5-qtserialport/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2015/10/26 19:04:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/01/17 19:30:48 markd Exp $
lib/pkgconfig/Qt5SerialPort.pc
qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialport_p.h
qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialportinfo_p.h
qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qtudev_p.h
+qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qwinoverlappedionotifier_p.h
qt5/include/QtSerialPort/QSerialPort
qt5/include/QtSerialPort/QSerialPortInfo
qt5/include/QtSerialPort/QtSerialPort
@@ -14,8 +15,11 @@ qt5/include/QtSerialPort/qserialportinfo.h
qt5/include/QtSerialPort/qtserialportversion.h
qt5/lib/cmake/Qt5SerialPort/Qt5SerialPortConfig.cmake
qt5/lib/cmake/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake
-qt5/lib/libQt5SerialPort.la
qt5/lib/libQt5SerialPort.prl
+qt5/lib/libQt5SerialPort.so
+qt5/lib/libQt5SerialPort.so.${PKGVERSION}
+qt5/lib/libQt5SerialPort.so.5
+qt5/lib/libQt5SerialPort.so.5.10
qt5/lib/pkgconfig/Qt5SerialPort.pc
qt5/mkspecs/modules/qt_lib_serialport.pri
qt5/mkspecs/modules/qt_lib_serialport_private.pri
diff --git a/x11/qt5-qtserialport/buildlink3.mk b/x11/qt5-qtserialport/buildlink3.mk
index d6fca07e36f..f3aa018e634 100644
--- a/x11/qt5-qtserialport/buildlink3.mk
+++ b/x11/qt5-qtserialport/buildlink3.mk
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/17 19:30:48 markd Exp $
BUILDLINK_TREE+= qt5-qtserialport
.if !defined(QT5_QTSERIALPORT_BUILDLINK3_MK)
QT5_QTSERIALPORT_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.5.1nb9
-BUILDLINK_PKGSRCDIR.qt5-qtserialport?= ../../x11/qt5-qtserialport
+BUILDLINK_API_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.9.1
+BUILDLINK_PKGSRCDIR.qt5-qtserialport?= ../../x11/qt5-qtserialport
BUILDLINK_INCDIRS.qt5-qtserialport+= qt5/include
BUILDLINK_LIBDIRS.qt5-qtserialport+= qt5/lib
diff --git a/x11/qt5-qtserialport/distinfo b/x11/qt5-qtserialport/distinfo
index e7f5abc79e4..c246c8be960 100644
--- a/x11/qt5-qtserialport/distinfo
+++ b/x11/qt5-qtserialport/distinfo
@@ -1,6 +1,6 @@
-$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 (qtserialport-opensource-src-5.5.1.tar.xz) = 0b8d935f95bbd071c914d1f8a99cdbdcadca2dc8
-RMD160 (qtserialport-opensource-src-5.5.1.tar.xz) = 00c53b307fd6ad509aedc6ed0b3a464ac3d8e809
-SHA512 (qtserialport-opensource-src-5.5.1.tar.xz) = 10e24f24e013ee7a28743a39cf25c6882eff2c9f5f8b707221fd0cdb3f54b17977a4b5b98402deb043623b01786c46bd59962545e085eb121ead06568d0ed16a
-Size (qtserialport-opensource-src-5.5.1.tar.xz) = 260984 bytes
+SHA1 (qtserialport-everywhere-src-5.10.0.tar.xz) = 8cd5939fef30022da1cc6a4701cff2253f8f2c36
+RMD160 (qtserialport-everywhere-src-5.10.0.tar.xz) = 4812afa01ccf90d0d45d8c69ae383a2fcdbdeb88
+SHA512 (qtserialport-everywhere-src-5.10.0.tar.xz) = a827dc7b2ed26753b2f960bf22355bd831335411c92f8774dc9ee8d6b74c7efec800623b91f5f1dfca90bc7bb7bc3176c9549e2cdd1f876e916293acf808fcc6
+Size (qtserialport-everywhere-src-5.10.0.tar.xz) = 296036 bytes
diff --git a/x11/qt5-qtsvg/Makefile b/x11/qt5-qtsvg/Makefile
index 92fadfd185b..91b80f2eb42 100644
--- a/x11/qt5-qtsvg/Makefile
+++ b/x11/qt5-qtsvg/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.22 2018/01/17 19:30:48 markd Exp $
-DISTNAME= qtsvg-opensource-src-${QTVERSION}
+DISTNAME= qtsvg-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtsvg-${QTVERSION}
-PKGREVISION= 9
COMMENT= Qt5 module for SVG
BUILD_TARGET= sub-src
diff --git a/x11/qt5-qtsvg/PLIST b/x11/qt5-qtsvg/PLIST
index 5a4dc5a46aa..4ad7d8ea5ec 100644
--- a/x11/qt5-qtsvg/PLIST
+++ b/x11/qt5-qtsvg/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2014/12/30 17:23:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/01/17 19:30:48 markd Exp $
lib/pkgconfig/Qt5Svg.pc
qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvgfont_p.h
-qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvgfunctions_wince_p.h
qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvggraphics_p.h
qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvghandler_p.h
qt5/include/QtSvg/${PKGVERSION}/QtSvg/private/qsvgnode_p.h
@@ -26,10 +25,13 @@ qt5/lib/cmake/Qt5Svg/Qt5SvgConfig.cmake
qt5/lib/cmake/Qt5Svg/Qt5SvgConfigVersion.cmake
qt5/lib/cmake/Qt5Svg/Qt5Svg_QSvgIconPlugin.cmake
qt5/lib/cmake/Qt5Svg/Qt5Svg_QSvgPlugin.cmake
-qt5/lib/libQt5Svg.la
qt5/lib/libQt5Svg.prl
+qt5/lib/libQt5Svg.so
+qt5/lib/libQt5Svg.so.${PKGVERSION}
+qt5/lib/libQt5Svg.so.5
+qt5/lib/libQt5Svg.so.5.10
qt5/lib/pkgconfig/Qt5Svg.pc
qt5/mkspecs/modules/qt_lib_svg.pri
qt5/mkspecs/modules/qt_lib_svg_private.pri
-qt5/plugins/iconengines/libqsvgicon.la
-qt5/plugins/imageformats/libqsvg.la
+qt5/plugins/iconengines/libqsvgicon.so
+qt5/plugins/imageformats/libqsvg.so
diff --git a/x11/qt5-qtsvg/buildlink3.mk b/x11/qt5-qtsvg/buildlink3.mk
index 6be4a127ab9..c34078872b6 100644
--- a/x11/qt5-qtsvg/buildlink3.mk
+++ b/x11/qt5-qtsvg/buildlink3.mk
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/17 19:30:48 markd Exp $
BUILDLINK_TREE+= qt5-qtsvg
.if !defined(QT5_QTSVG_BUILDLINK3_MK)
QT5_QTSVG_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.5.1nb9
-BUILDLINK_PKGSRCDIR.qt5-qtsvg?= ../../x11/qt5-qtsvg
+BUILDLINK_API_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.9.1
+BUILDLINK_PKGSRCDIR.qt5-qtsvg?= ../../x11/qt5-qtsvg
BUILDLINK_INCDIRS.qt5-qtsvg+= qt5/include
BUILDLINK_LIBDIRS.qt5-qtsvg+= qt5/lib
diff --git a/x11/qt5-qtsvg/distinfo b/x11/qt5-qtsvg/distinfo
index 3d30c938c41..17d14a80a2a 100644
--- a/x11/qt5-qtsvg/distinfo
+++ b/x11/qt5-qtsvg/distinfo
@@ -1,6 +1,6 @@
-$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 (qtsvg-opensource-src-5.5.1.tar.xz) = 701fcc10201abcf540d26a8fcc6a8b7184dc16b1
-RMD160 (qtsvg-opensource-src-5.5.1.tar.xz) = db1dd37355a1e4b40a37decc1df60d574ab14088
-SHA512 (qtsvg-opensource-src-5.5.1.tar.xz) = 68b53c5564618922b9df8f4600a4f90a2d3bb4e985b1edec7f4934505399555c0de89b724b1b97ac19bf1119e72e1a06569d5ae7f73ce5c1cad93a66ac0b5a83
-Size (qtsvg-opensource-src-5.5.1.tar.xz) = 1802880 bytes
+SHA1 (qtsvg-everywhere-src-5.10.0.tar.xz) = c76bc70079d865c42c0b4f6f82c8578354b393d9
+RMD160 (qtsvg-everywhere-src-5.10.0.tar.xz) = 3b14b32963d5aab1764ed3d96e408129261a2119
+SHA512 (qtsvg-everywhere-src-5.10.0.tar.xz) = 6103015629da60d1bd424a86dbfa88ac955151e2d6883abafcb14a8f6a405397e61855f15c41527549b1dbe89376df6753b3a6919717d2948215eb86843f0b13
+Size (qtsvg-everywhere-src-5.10.0.tar.xz) = 1797828 bytes
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)
-
diff --git a/x11/qt5-qttranslations/Makefile b/x11/qt5-qttranslations/Makefile
index 7d7d16a133b..dcf3a142944 100644
--- a/x11/qt5-qttranslations/Makefile
+++ b/x11/qt5-qttranslations/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2017/11/30 16:45:43 adam Exp $
+# $NetBSD: Makefile,v 1.32 2018/01/17 19:30:48 markd Exp $
-DISTNAME= qttranslations-opensource-src-${QTVERSION}
+DISTNAME= qttranslations-everywhere-src-${QTVERSION}
PKGNAME= qt5-qttranslations-${QTVERSION}
-PKGREVISION= 15
COMMENT= Qt5 translations
MAKE_ENV+= QTDIR=${QTDIR}
diff --git a/x11/qt5-qttranslations/PLIST b/x11/qt5-qttranslations/PLIST
index be783a6ce91..a015d9525b6 100644
--- a/x11/qt5-qttranslations/PLIST
+++ b/x11/qt5-qttranslations/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2015/10/26 19:04:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/01/17 19:30:48 markd Exp $
+qt5/translations/assistant_bg.qm
qt5/translations/assistant_cs.qm
qt5/translations/assistant_da.qm
qt5/translations/assistant_de.qm
qt5/translations/assistant_en.qm
+qt5/translations/assistant_es.qm
qt5/translations/assistant_fr.qm
qt5/translations/assistant_hu.qm
qt5/translations/assistant_ja.qm
@@ -14,9 +16,12 @@ qt5/translations/assistant_sl.qm
qt5/translations/assistant_uk.qm
qt5/translations/assistant_zh_CN.qm
qt5/translations/assistant_zh_TW.qm
+qt5/translations/designer_bg.qm
qt5/translations/designer_cs.qm
+qt5/translations/designer_da.qm
qt5/translations/designer_de.qm
qt5/translations/designer_en.qm
+qt5/translations/designer_es.qm
qt5/translations/designer_fr.qm
qt5/translations/designer_hu.qm
qt5/translations/designer_ja.qm
@@ -28,9 +33,12 @@ qt5/translations/designer_sl.qm
qt5/translations/designer_uk.qm
qt5/translations/designer_zh_CN.qm
qt5/translations/designer_zh_TW.qm
+qt5/translations/linguist_bg.qm
qt5/translations/linguist_cs.qm
+qt5/translations/linguist_da.qm
qt5/translations/linguist_de.qm
qt5/translations/linguist_en.qm
+qt5/translations/linguist_es.qm
qt5/translations/linguist_fr.qm
qt5/translations/linguist_hu.qm
qt5/translations/linguist_ja.qm
@@ -42,17 +50,23 @@ qt5/translations/linguist_sl.qm
qt5/translations/linguist_uk.qm
qt5/translations/linguist_zh_CN.qm
qt5/translations/linguist_zh_TW.qm
+qt5/translations/qmlviewer_bg.qm
qt5/translations/qmlviewer_cs.qm
+qt5/translations/qmlviewer_da.qm
qt5/translations/qmlviewer_en.qm
+qt5/translations/qmlviewer_es.qm
qt5/translations/qmlviewer_fi.qm
qt5/translations/qmlviewer_fr.qm
+qt5/translations/qmlviewer_he.qm
qt5/translations/qmlviewer_hu.qm
qt5/translations/qmlviewer_ja.qm
qt5/translations/qmlviewer_ko.qm
+qt5/translations/qmlviewer_pl.qm
qt5/translations/qmlviewer_ru.qm
qt5/translations/qmlviewer_sk.qm
qt5/translations/qmlviewer_uk.qm
qt5/translations/qt_ar.qm
+qt5/translations/qt_bg.qm
qt5/translations/qt_ca.qm
qt5/translations/qt_cs.qm
qt5/translations/qt_da.qm
@@ -64,10 +78,12 @@ qt5/translations/qt_fi.qm
qt5/translations/qt_fr.qm
qt5/translations/qt_gl.qm
qt5/translations/qt_he.qm
+qt5/translations/qt_help_bg.qm
qt5/translations/qt_help_cs.qm
qt5/translations/qt_help_da.qm
qt5/translations/qt_help_de.qm
qt5/translations/qt_help_en.qm
+qt5/translations/qt_help_es.qm
qt5/translations/qt_help_fr.qm
qt5/translations/qt_help_gl.qm
qt5/translations/qt_help_hu.qm
@@ -95,18 +111,23 @@ qt5/translations/qt_sv.qm
qt5/translations/qt_uk.qm
qt5/translations/qt_zh_CN.qm
qt5/translations/qt_zh_TW.qm
+qt5/translations/qtbase_bg.qm
qt5/translations/qtbase_ca.qm
qt5/translations/qtbase_cs.qm
+qt5/translations/qtbase_da.qm
qt5/translations/qtbase_de.qm
qt5/translations/qtbase_en.qm
+qt5/translations/qtbase_es.qm
qt5/translations/qtbase_fi.qm
qt5/translations/qtbase_fr.qm
+qt5/translations/qtbase_gd.qm
qt5/translations/qtbase_he.qm
qt5/translations/qtbase_hu.qm
qt5/translations/qtbase_it.qm
qt5/translations/qtbase_ja.qm
qt5/translations/qtbase_ko.qm
qt5/translations/qtbase_lv.qm
+qt5/translations/qtbase_pl.qm
qt5/translations/qtbase_ru.qm
qt5/translations/qtbase_sk.qm
qt5/translations/qtbase_uk.qm
@@ -120,42 +141,63 @@ qt5/translations/qtconfig_sl.qm
qt5/translations/qtconfig_uk.qm
qt5/translations/qtconfig_zh_CN.qm
qt5/translations/qtconfig_zh_TW.qm
+qt5/translations/qtconnectivity_bg.qm
+qt5/translations/qtconnectivity_da.qm
qt5/translations/qtconnectivity_de.qm
qt5/translations/qtconnectivity_en.qm
+qt5/translations/qtconnectivity_es.qm
qt5/translations/qtconnectivity_ko.qm
+qt5/translations/qtconnectivity_pl.qm
+qt5/translations/qtconnectivity_ru.qm
qt5/translations/qtconnectivity_uk.qm
+qt5/translations/qtdeclarative_bg.qm
+qt5/translations/qtdeclarative_da.qm
qt5/translations/qtdeclarative_de.qm
qt5/translations/qtdeclarative_en.qm
+qt5/translations/qtdeclarative_es.qm
qt5/translations/qtdeclarative_fi.qm
qt5/translations/qtdeclarative_fr.qm
qt5/translations/qtdeclarative_ja.qm
qt5/translations/qtdeclarative_ko.qm
qt5/translations/qtdeclarative_lv.qm
+qt5/translations/qtdeclarative_pl.qm
qt5/translations/qtdeclarative_ru.qm
qt5/translations/qtdeclarative_sk.qm
qt5/translations/qtdeclarative_uk.qm
+qt5/translations/qtlocation_bg.qm
+qt5/translations/qtlocation_da.qm
qt5/translations/qtlocation_de.qm
qt5/translations/qtlocation_en.qm
+qt5/translations/qtlocation_es.qm
qt5/translations/qtlocation_fr.qm
qt5/translations/qtlocation_ko.qm
+qt5/translations/qtlocation_pl.qm
+qt5/translations/qtlocation_ru.qm
qt5/translations/qtlocation_uk.qm
+qt5/translations/qtmultimedia_bg.qm
qt5/translations/qtmultimedia_ca.qm
qt5/translations/qtmultimedia_cs.qm
+qt5/translations/qtmultimedia_da.qm
qt5/translations/qtmultimedia_de.qm
qt5/translations/qtmultimedia_en.qm
+qt5/translations/qtmultimedia_es.qm
qt5/translations/qtmultimedia_fi.qm
qt5/translations/qtmultimedia_fr.qm
qt5/translations/qtmultimedia_hu.qm
qt5/translations/qtmultimedia_it.qm
qt5/translations/qtmultimedia_ja.qm
qt5/translations/qtmultimedia_ko.qm
+qt5/translations/qtmultimedia_pl.qm
qt5/translations/qtmultimedia_ru.qm
qt5/translations/qtmultimedia_sk.qm
qt5/translations/qtmultimedia_uk.qm
+qt5/translations/qtquick1_bg.qm
qt5/translations/qtquick1_ca.qm
qt5/translations/qtquick1_cs.qm
+qt5/translations/qtquick1_da.qm
qt5/translations/qtquick1_de.qm
qt5/translations/qtquick1_en.qm
+qt5/translations/qtquick1_es.qm
qt5/translations/qtquick1_fi.qm
qt5/translations/qtquick1_fr.qm
qt5/translations/qtquick1_he.qm
@@ -163,9 +205,15 @@ qt5/translations/qtquick1_hu.qm
qt5/translations/qtquick1_it.qm
qt5/translations/qtquick1_ja.qm
qt5/translations/qtquick1_ko.qm
+qt5/translations/qtquick1_pl.qm
qt5/translations/qtquick1_ru.qm
qt5/translations/qtquick1_sk.qm
qt5/translations/qtquick1_uk.qm
+qt5/translations/qtquickcontrols2_bg.qm
+qt5/translations/qtquickcontrols2_en.qm
+qt5/translations/qtquickcontrols2_ko.qm
+qt5/translations/qtquickcontrols2_uk.qm
+qt5/translations/qtquickcontrols_bg.qm
qt5/translations/qtquickcontrols_de.qm
qt5/translations/qtquickcontrols_en.qm
qt5/translations/qtquickcontrols_fi.qm
@@ -173,10 +221,13 @@ qt5/translations/qtquickcontrols_fr.qm
qt5/translations/qtquickcontrols_ja.qm
qt5/translations/qtquickcontrols_ru.qm
qt5/translations/qtquickcontrols_uk.qm
+qt5/translations/qtscript_bg.qm
qt5/translations/qtscript_ca.qm
qt5/translations/qtscript_cs.qm
+qt5/translations/qtscript_da.qm
qt5/translations/qtscript_de.qm
qt5/translations/qtscript_en.qm
+qt5/translations/qtscript_es.qm
qt5/translations/qtscript_fi.qm
qt5/translations/qtscript_fr.qm
qt5/translations/qtscript_he.qm
@@ -185,20 +236,47 @@ qt5/translations/qtscript_it.qm
qt5/translations/qtscript_ja.qm
qt5/translations/qtscript_ko.qm
qt5/translations/qtscript_lv.qm
+qt5/translations/qtscript_pl.qm
qt5/translations/qtscript_ru.qm
qt5/translations/qtscript_sk.qm
qt5/translations/qtscript_uk.qm
+qt5/translations/qtserialport_de.qm
+qt5/translations/qtserialport_en.qm
+qt5/translations/qtserialport_es.qm
+qt5/translations/qtserialport_ja.qm
+qt5/translations/qtserialport_ko.qm
+qt5/translations/qtserialport_pl.qm
+qt5/translations/qtserialport_ru.qm
+qt5/translations/qtserialport_uk.qm
+qt5/translations/qtwebengine_de.qm
+qt5/translations/qtwebengine_en.qm
+qt5/translations/qtwebengine_es.qm
+qt5/translations/qtwebengine_ko.qm
+qt5/translations/qtwebengine_pl.qm
+qt5/translations/qtwebengine_ru.qm
+qt5/translations/qtwebengine_uk.qm
+qt5/translations/qtwebsockets_de.qm
qt5/translations/qtwebsockets_en.qm
+qt5/translations/qtwebsockets_es.qm
qt5/translations/qtwebsockets_fr.qm
+qt5/translations/qtwebsockets_ja.qm
+qt5/translations/qtwebsockets_ko.qm
+qt5/translations/qtwebsockets_pl.qm
+qt5/translations/qtwebsockets_ru.qm
+qt5/translations/qtwebsockets_uk.qm
+qt5/translations/qtxmlpatterns_bg.qm
qt5/translations/qtxmlpatterns_ca.qm
qt5/translations/qtxmlpatterns_cs.qm
+qt5/translations/qtxmlpatterns_da.qm
qt5/translations/qtxmlpatterns_de.qm
qt5/translations/qtxmlpatterns_en.qm
+qt5/translations/qtxmlpatterns_es.qm
qt5/translations/qtxmlpatterns_fr.qm
qt5/translations/qtxmlpatterns_hu.qm
qt5/translations/qtxmlpatterns_it.qm
qt5/translations/qtxmlpatterns_ja.qm
qt5/translations/qtxmlpatterns_ko.qm
+qt5/translations/qtxmlpatterns_pl.qm
qt5/translations/qtxmlpatterns_ru.qm
qt5/translations/qtxmlpatterns_sk.qm
qt5/translations/qtxmlpatterns_uk.qm
diff --git a/x11/qt5-qttranslations/distinfo b/x11/qt5-qttranslations/distinfo
index 2c1f0d95852..9df1e2b67b7 100644
--- a/x11/qt5-qttranslations/distinfo
+++ b/x11/qt5-qttranslations/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 19:30:48 markd Exp $
-SHA1 (qttranslations-opensource-src-5.5.1.tar.xz) = 0385274c9f77217f2cefbb11a56ce49e385854b3
-RMD160 (qttranslations-opensource-src-5.5.1.tar.xz) = f9c956935768cea5c935a10493963f7e411dc255
-SHA512 (qttranslations-opensource-src-5.5.1.tar.xz) = 026ee89aadd8acac609fb7e7813f8a1e9cad06912fb3e7b73ec28662b37cd353515f5d66c6ed1839d7c18006b41c88c315ac9a9001eb08637242a73753349be7
-Size (qttranslations-opensource-src-5.5.1.tar.xz) = 1153132 bytes
+SHA1 (qttranslations-everywhere-src-5.10.0.tar.xz) = 37d088d1c74f34ad731a296e370956fa22bce7e0
+RMD160 (qttranslations-everywhere-src-5.10.0.tar.xz) = b1241f6cef22688f73a10548dd956090e6b7ede5
+SHA512 (qttranslations-everywhere-src-5.10.0.tar.xz) = 5e6b674da52da4d0e38b2001bf0f70f764e6c096554d1724ba0f4bae8eca53f71168e374a0249d31e6ed72a1ebf1c3f745e8cb913b49cdcb3e98116edceb5257
+Size (qttranslations-everywhere-src-5.10.0.tar.xz) = 1444932 bytes
diff --git a/x11/qt5-qtwebchannel/Makefile b/x11/qt5-qtwebchannel/Makefile
index f8b38a3a1dc..76ab9257703 100644
--- a/x11/qt5-qtwebchannel/Makefile
+++ b/x11/qt5-qtwebchannel/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.18 2018/01/17 19:30:48 markd Exp $
-DISTNAME= qtwebchannel-opensource-src-${QTVERSION}
+DISTNAME= qtwebchannel-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtwebchannel-${QTVERSION}
-PKGREVISION= 10
COMMENT= Qt5 WebChannel module
MAKE_ENV+= QTDIR=${QTDIR}
diff --git a/x11/qt5-qtwebchannel/PLIST b/x11/qt5-qtwebchannel/PLIST
index 7a9bdceb2c2..ef54f1f8d15 100644
--- a/x11/qt5-qtwebchannel/PLIST
+++ b/x11/qt5-qtwebchannel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/02/08 09:01:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/01/17 19:30:48 markd Exp $
lib/pkgconfig/Qt5WebChannel.pc
qt5/include/QtWebChannel/${PKGVERSION}/QtWebChannel/private/qmetaobjectpublisher_p.h
qt5/include/QtWebChannel/${PKGVERSION}/QtWebChannel/private/qqmlwebchannelattached_p.h
@@ -18,11 +18,14 @@ qt5/include/QtWebChannel/qwebchannelabstracttransport.h
qt5/include/QtWebChannel/qwebchannelglobal.h
qt5/lib/cmake/Qt5WebChannel/Qt5WebChannelConfig.cmake
qt5/lib/cmake/Qt5WebChannel/Qt5WebChannelConfigVersion.cmake
-qt5/lib/libQt5WebChannel.la
qt5/lib/libQt5WebChannel.prl
+qt5/lib/libQt5WebChannel.so
+qt5/lib/libQt5WebChannel.so.${PKGVERSION}
+qt5/lib/libQt5WebChannel.so.5
+qt5/lib/libQt5WebChannel.so.5.10
qt5/lib/pkgconfig/Qt5WebChannel.pc
qt5/mkspecs/modules/qt_lib_webchannel.pri
qt5/mkspecs/modules/qt_lib_webchannel_private.pri
-qt5/qml/QtWebChannel/libdeclarative_webchannel.la
+qt5/qml/QtWebChannel/libdeclarative_webchannel.so
qt5/qml/QtWebChannel/plugins.qmltypes
qt5/qml/QtWebChannel/qmldir
diff --git a/x11/qt5-qtwebchannel/buildlink3.mk b/x11/qt5-qtwebchannel/buildlink3.mk
index 15d5fe6f8f3..126104229d6 100644
--- a/x11/qt5-qtwebchannel/buildlink3.mk
+++ b/x11/qt5-qtwebchannel/buildlink3.mk
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2018/01/17 19:30:48 markd Exp $
BUILDLINK_TREE+= qt5-qtwebchannel
.if !defined(QT5_QTWEBCHANNEL_BUILDLINK3_MK)
QT5_QTWEBCHANNEL_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.5.1nb10
-BUILDLINK_PKGSRCDIR.qt5-qtwebchannel?= ../../x11/qt5-qtwebchannel
+BUILDLINK_API_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.9.1
+BUILDLINK_PKGSRCDIR.qt5-qtwebchannel?= ../../x11/qt5-qtwebchannel
BUILDLINK_INCDIRS.qt5-qtwebchannel+= qt5/include
BUILDLINK_LIBDIRS.qt5-qtwebchannel+= qt5/lib
diff --git a/x11/qt5-qtwebchannel/distinfo b/x11/qt5-qtwebchannel/distinfo
index 6bca20f4c50..f2dcec855dc 100644
--- a/x11/qt5-qtwebchannel/distinfo
+++ b/x11/qt5-qtwebchannel/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 19:30:48 markd Exp $
-SHA1 (qtwebchannel-opensource-src-5.5.1.tar.xz) = 37f2cdf7d289b2d48d3f35d4181908acd8f353eb
-RMD160 (qtwebchannel-opensource-src-5.5.1.tar.xz) = fca861f785f9d718aa17853bf7a3c072efcd53b7
-SHA512 (qtwebchannel-opensource-src-5.5.1.tar.xz) = 018b36b150adb18ac681e76cf52c120e1873c10ac937a311397025e556b74800db3b7d472d2373ddeaa2f9527beeac5c1ca6f57a808aa3f5c19a558cdb2ac699
-Size (qtwebchannel-opensource-src-5.5.1.tar.xz) = 96684 bytes
+SHA1 (qtwebchannel-everywhere-src-5.10.0.tar.xz) = 87a2b19e060bfa7d06a02ddf663b81cd7643ca9e
+RMD160 (qtwebchannel-everywhere-src-5.10.0.tar.xz) = 676da446eef3fd240b00a962cdde0fa077ba8a37
+SHA512 (qtwebchannel-everywhere-src-5.10.0.tar.xz) = 2641d70afd797b8860177301805ec255b026605059d4dc95ced5041c56ec3875fb6369e7e4d1a84e6ee50557a0b41c21dfb5020636c16aac61a3f0ea62208acb
+Size (qtwebchannel-everywhere-src-5.10.0.tar.xz) = 167800 bytes
diff --git a/x11/qt5-qtwebsockets/Makefile b/x11/qt5-qtwebsockets/Makefile
index 09353d852c4..1aa08b936c7 100644
--- a/x11/qt5-qtwebsockets/Makefile
+++ b/x11/qt5-qtwebsockets/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.16 2018/01/17 19:30:48 markd Exp $
-DISTNAME= qtwebsockets-opensource-src-${QTVERSION}
-PKGNAME= qt5-websockets-${QTVERSION}
-PKGREVISION= 10
+DISTNAME= qtwebsockets-everywhere-src-${QTVERSION}
+PKGNAME= qt5-qtwebsockets-${QTVERSION}
COMMENT= Qt5 module for websockets
MAKE_ENV+= QTDIR=${QTDIR}
@@ -17,6 +16,5 @@ post-install:
ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
.endfor
-
.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt5-qtwebsockets/PLIST b/x11/qt5-qtwebsockets/PLIST
index 39c50262425..3703f504788 100644
--- a/x11/qt5-qtwebsockets/PLIST
+++ b/x11/qt5-qtwebsockets/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/05/03 07:32:54 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/01/17 19:30:48 markd Exp $
lib/pkgconfig/Qt5WebSockets.pc
qt5/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qdefaultmaskgenerator_p.h
qt5/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qsslserver_p.h
@@ -13,6 +13,7 @@ qt5/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qwebsocketserver_p.h
qt5/include/QtWebSockets/QMaskGenerator
qt5/include/QtWebSockets/QWebSocket
qt5/include/QtWebSockets/QWebSocketCorsAuthenticator
+qt5/include/QtWebSockets/QWebSocketProtocol
qt5/include/QtWebSockets/QWebSocketServer
qt5/include/QtWebSockets/QtWebSockets
qt5/include/QtWebSockets/QtWebSocketsDepends
@@ -26,12 +27,15 @@ qt5/include/QtWebSockets/qwebsockets_global.h
qt5/include/QtWebSockets/qwebsocketserver.h
qt5/lib/cmake/Qt5WebSockets/Qt5WebSocketsConfig.cmake
qt5/lib/cmake/Qt5WebSockets/Qt5WebSocketsConfigVersion.cmake
-qt5/lib/libQt5WebSockets.la
qt5/lib/libQt5WebSockets.prl
+qt5/lib/libQt5WebSockets.so
+qt5/lib/libQt5WebSockets.so.${PKGVERSION}
+qt5/lib/libQt5WebSockets.so.5
+qt5/lib/libQt5WebSockets.so.5.10
qt5/lib/pkgconfig/Qt5WebSockets.pc
qt5/mkspecs/modules/qt_lib_websockets.pri
qt5/mkspecs/modules/qt_lib_websockets_private.pri
qt5/qml/Qt/WebSockets/qmldir
-qt5/qml/QtWebSockets/libdeclarative_qmlwebsockets.la
+qt5/qml/QtWebSockets/libdeclarative_qmlwebsockets.so
qt5/qml/QtWebSockets/plugins.qmltypes
qt5/qml/QtWebSockets/qmldir
diff --git a/x11/qt5-qtwebsockets/buildlink3.mk b/x11/qt5-qtwebsockets/buildlink3.mk
index 6be09b47d53..4bc245f8a3e 100644
--- a/x11/qt5-qtwebsockets/buildlink3.mk
+++ b/x11/qt5-qtwebsockets/buildlink3.mk
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/17 19:30:48 markd Exp $
-BUILDLINK_TREE+= qt5-websockets
+BUILDLINK_TREE+= qt5-qtwebsockets
.if !defined(QT5_WEBSOCKETS_BUILDLINK3_MK)
QT5_WEBSOCKETS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-websockets+= qt5-websockets>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-websockets+= qt5-websockets>=5.5.1nb10
-BUILDLINK_PKGSRCDIR.qt5-websockets?= ../../x11/qt5-qtwebsockets
+BUILDLINK_API_DEPENDS.qt5-qtwebsockets+= qt5-qtwebsockets>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtwebsockets+= qt5-qtwebsockets>=5.9.1
+BUILDLINK_PKGSRCDIR.qt5-qtwebsockets?= ../../x11/qt5-qtwebsockets
.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
.endif # QT5_WEBSOCKETS_BUILDLINK3_MK
-BUILDLINK_TREE+= -qt5-websockets
+BUILDLINK_TREE+= -qt5-qtwebsockets
diff --git a/x11/qt5-qtwebsockets/distinfo b/x11/qt5-qtwebsockets/distinfo
index 9a2fe657012..7b2f0afc9d3 100644
--- a/x11/qt5-qtwebsockets/distinfo
+++ b/x11/qt5-qtwebsockets/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 19:30:48 markd Exp $
-SHA1 (qtwebsockets-opensource-src-5.5.1.tar.xz) = 76f40fa6b8c075651c3abe2293a33fdc70f8944b
-RMD160 (qtwebsockets-opensource-src-5.5.1.tar.xz) = 83dcc5d07dca6c1cccfaed13cd16fde940ad0b94
-SHA512 (qtwebsockets-opensource-src-5.5.1.tar.xz) = 1172269ed99eb0ef73935bb7adfb353cf7ea17240d1370cefbdb648f84151d79d8e3738258444eef15356ef733beae4912507835edbb34028d0960406dc6257f
-Size (qtwebsockets-opensource-src-5.5.1.tar.xz) = 170440 bytes
+SHA1 (qtwebsockets-everywhere-src-5.10.0.tar.xz) = 74c77ab4382d40ac0142d88713b2072e9c014d47
+RMD160 (qtwebsockets-everywhere-src-5.10.0.tar.xz) = e3674dcf35d0165ce0537f328fc3f950c71844d2
+SHA512 (qtwebsockets-everywhere-src-5.10.0.tar.xz) = 553251de549c2c49664bfdddd57e4af378b9ff8e98b11b4a2dd422c96066fcce2dc5304aae4007ce863340a1efa8019f73db1ca5d458694b8cfb7b0837cbf95e
+Size (qtwebsockets-everywhere-src-5.10.0.tar.xz) = 220592 bytes
diff --git a/x11/qt5-qtx11extras/Makefile b/x11/qt5-qtx11extras/Makefile
index 52c7d11a3ca..0bc063c3386 100644
--- a/x11/qt5-qtx11extras/Makefile
+++ b/x11/qt5-qtx11extras/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.22 2018/01/17 19:30:49 markd Exp $
-DISTNAME= qtx11extras-opensource-src-${QTVERSION}
+DISTNAME= qtx11extras-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtx11extras-${QTVERSION}
-PKGREVISION= 9
COMMENT= Qt5 module for X11 extras
BUILD_TARGET= sub-src
diff --git a/x11/qt5-qtx11extras/PLIST b/x11/qt5-qtx11extras/PLIST
index 3d4970e501d..55830e004a2 100644
--- a/x11/qt5-qtx11extras/PLIST
+++ b/x11/qt5-qtx11extras/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:36 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/01/17 19:30:49 markd Exp $
lib/pkgconfig/Qt5X11Extras.pc
qt5/include/QtX11Extras/QX11Info
qt5/include/QtX11Extras/QtX11Extras
@@ -9,8 +9,11 @@ qt5/include/QtX11Extras/qtx11extrasversion.h
qt5/include/QtX11Extras/qx11info_x11.h
qt5/lib/cmake/Qt5X11Extras/Qt5X11ExtrasConfig.cmake
qt5/lib/cmake/Qt5X11Extras/Qt5X11ExtrasConfigVersion.cmake
-qt5/lib/libQt5X11Extras.la
qt5/lib/libQt5X11Extras.prl
+qt5/lib/libQt5X11Extras.so
+qt5/lib/libQt5X11Extras.so.5
+qt5/lib/libQt5X11Extras.so.5.10
+qt5/lib/libQt5X11Extras.so.${PKGVERSION}
qt5/lib/pkgconfig/Qt5X11Extras.pc
qt5/mkspecs/modules/qt_lib_x11extras.pri
qt5/mkspecs/modules/qt_lib_x11extras_private.pri
diff --git a/x11/qt5-qtx11extras/buildlink3.mk b/x11/qt5-qtx11extras/buildlink3.mk
index fa38ca93f98..2e3dc8c229b 100644
--- a/x11/qt5-qtx11extras/buildlink3.mk
+++ b/x11/qt5-qtx11extras/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.18 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/17 19:30:49 markd Exp $
BUILDLINK_TREE+= qt5-qtx11extras
.if !defined(QT5_QTX11EXTRAS_BUILDLINK3_MK)
QT5_QTX11EXTRAS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtx11extras+= qt5-qtx11extras>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtx11extras+= qt5-qtx11extras>=5.5.1nb9
+BUILDLINK_API_DEPENDS.qt5-qtx11extras+= qt5-qtx11extras>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtx11extras+= qt5-qtx11extras>=5.9.1
BUILDLINK_PKGSRCDIR.qt5-qtx11extras?= ../../x11/qt5-qtx11extras
BUILDLINK_INCDIRS.qt5-qtx11extras+= qt5/include
diff --git a/x11/qt5-qtx11extras/distinfo b/x11/qt5-qtx11extras/distinfo
index ea8b9639201..57621a077d1 100644
--- a/x11/qt5-qtx11extras/distinfo
+++ b/x11/qt5-qtx11extras/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 19:30:49 markd Exp $
-SHA1 (qtx11extras-opensource-src-5.5.1.tar.xz) = 1b200045600ddd93aaf8eb489d7bdc09a172b8fe
-RMD160 (qtx11extras-opensource-src-5.5.1.tar.xz) = d14ee6fbaa96eb59bd7ce4319371230ddc65f39a
-SHA512 (qtx11extras-opensource-src-5.5.1.tar.xz) = 5c89324cc0335c97d8028894d3a190cabfde3a132403a9983a10f32d557d146de65cd534b9cf1a7fe85251e5f0f91e009072f8f02d9b03f58318543993cf7a14
-Size (qtx11extras-opensource-src-5.5.1.tar.xz) = 33416 bytes
+SHA1 (qtx11extras-everywhere-src-5.10.0.tar.xz) = bb0c324791a0f7f7e806f81904f217c99529f393
+RMD160 (qtx11extras-everywhere-src-5.10.0.tar.xz) = 517171996bea4475061602ebe1d5753ffb2e40e2
+SHA512 (qtx11extras-everywhere-src-5.10.0.tar.xz) = 7173ca61fcff933683a13a0cf6989d49707b95befeb4920e980f90f8f8976a6dcd427d3fb87aa1d2124561b0bc80f3bfddf31fd1777f2213b5243680f1c30760
+Size (qtx11extras-everywhere-src-5.10.0.tar.xz) = 101216 bytes
diff --git a/x11/qt5-qtxmlpatterns/Makefile b/x11/qt5-qtxmlpatterns/Makefile
index 53a93a74a06..39ca68cdbed 100644
--- a/x11/qt5-qtxmlpatterns/Makefile
+++ b/x11/qt5-qtxmlpatterns/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2017/11/30 16:45:14 adam Exp $
+# $NetBSD: Makefile,v 1.22 2018/01/17 19:30:49 markd Exp $
-DISTNAME= qtxmlpatterns-opensource-src-${QTVERSION}
+DISTNAME= qtxmlpatterns-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtxmlpatterns-${QTVERSION}
-PKGREVISION= 9
COMMENT= Qt5 module for XML Patterns
-#NO_CONFIGURE= yes
BUILD_TARGET= sub-tools
INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
diff --git a/x11/qt5-qtxmlpatterns/PLIST b/x11/qt5-qtxmlpatterns/PLIST
index 1c2f05f56db..97056b7e075 100644
--- a/x11/qt5-qtxmlpatterns/PLIST
+++ b/x11/qt5-qtxmlpatterns/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/10/26 19:04:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/01/17 19:30:49 markd Exp $
lib/pkgconfig/Qt5XmlPatterns.pc
qt5/bin/xmlpatterns
qt5/bin/xmlpatternsvalidator
@@ -284,6 +284,7 @@ qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtreatas_p.h
qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtriplecontainer_p.h
qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtruthpredicate_p.h
qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtypeavailablefn_p.h
+qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtxmlpatterns-config_p.h
qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtypechecker_p.h
qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qunaryexpression_p.h
qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qunioniterator_p.h
@@ -395,6 +396,7 @@ qt5/include/QtXmlPatterns/qabstractxmlnodemodel.h
qt5/include/QtXmlPatterns/qabstractxmlreceiver.h
qt5/include/QtXmlPatterns/qsimplexmlnodemodel.h
qt5/include/QtXmlPatterns/qsourcelocation.h
+qt5/include/QtXmlPatterns/qtxmlpatterns-config.h
qt5/include/QtXmlPatterns/qtxmlpatternsglobal.h
qt5/include/QtXmlPatterns/qtxmlpatternsversion.h
qt5/include/QtXmlPatterns/qxmlformatter.h
@@ -407,8 +409,11 @@ qt5/include/QtXmlPatterns/qxmlschemavalidator.h
qt5/include/QtXmlPatterns/qxmlserializer.h
qt5/lib/cmake/Qt5XmlPatterns/Qt5XmlPatternsConfig.cmake
qt5/lib/cmake/Qt5XmlPatterns/Qt5XmlPatternsConfigVersion.cmake
-qt5/lib/libQt5XmlPatterns.la
qt5/lib/libQt5XmlPatterns.prl
+qt5/lib/libQt5XmlPatterns.so
+qt5/lib/libQt5XmlPatterns.so.5
+qt5/lib/libQt5XmlPatterns.so.5.10
+qt5/lib/libQt5XmlPatterns.so.${PKGVERSION}
qt5/lib/pkgconfig/Qt5XmlPatterns.pc
qt5/mkspecs/modules/qt_lib_xmlpatterns.pri
qt5/mkspecs/modules/qt_lib_xmlpatterns_private.pri
diff --git a/x11/qt5-qtxmlpatterns/buildlink3.mk b/x11/qt5-qtxmlpatterns/buildlink3.mk
index bdab9cc4fa0..a30253a5d8d 100644
--- a/x11/qt5-qtxmlpatterns/buildlink3.mk
+++ b/x11/qt5-qtxmlpatterns/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2018/01/17 19:30:49 markd Exp $
BUILDLINK_TREE+= qt5-qtxmlpatterns
.if !defined(QT5_QTXMLPATTERNS_BUILDLINK3_MK)
QT5_QTXMLPATTERNS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.5.1nb9
+BUILDLINK_API_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.9.1
BUILDLINK_PKGSRCDIR.qt5-qtxmlpatterns?= ../../x11/qt5-qtxmlpatterns
BUILDLINK_INCDIRS.qt5-qtxmlpatterns+= qt5/include
diff --git a/x11/qt5-qtxmlpatterns/distinfo b/x11/qt5-qtxmlpatterns/distinfo
index 31d7ba075b1..825074dfade 100644
--- a/x11/qt5-qtxmlpatterns/distinfo
+++ b/x11/qt5-qtxmlpatterns/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 19:30:49 markd Exp $
-SHA1 (qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 15d2aeaaee4840aa3b015dfc7502982a0e5685f5
-RMD160 (qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 403a3b2377728629b6a3f1073b24af3f3360adf7
-SHA512 (qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 2d225f686e0f081f7833b3a79ca8cff85d02e49f57be59ba9daff028965d9fc8e2b0389778d7415578b540f056c86e5b9127c7f93c6af1d1828a4fe73d9bfa10
-Size (qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 1323560 bytes
+SHA1 (qtxmlpatterns-everywhere-src-5.10.0.tar.xz) = 78f5e23de54c0a34970929284baac00dec6ab59b
+RMD160 (qtxmlpatterns-everywhere-src-5.10.0.tar.xz) = 08834dd53ccedb25889c58094a68701cd1fdef49
+SHA512 (qtxmlpatterns-everywhere-src-5.10.0.tar.xz) = ccdc4f4bd57b7e2bb5010f65869910fe1305a36e99594d7505a4e327bffe0e33151850f1baa7ff15df50fe86aa9c7e2486de8c397f21273f66daedf0d9b70c47
+Size (qtxmlpatterns-everywhere-src-5.10.0.tar.xz) = 1385216 bytes
diff --git a/x11/qt5/Makefile b/x11/qt5/Makefile
index a7b98e62763..1f2e620cefe 100644
--- a/x11/qt5/Makefile
+++ b/x11/qt5/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2017/12/05 19:57:46 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2018/01/17 19:30:46 markd Exp $
DISTNAME= qt5-${QTVERSION}
-PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= # none
@@ -11,9 +10,6 @@ META_PACKAGE= yes
.include "Makefile.common"
-DEPENDS+= qt5-mysql-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-mysql
-DEPENDS+= qt5-odbc-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-odbc
-DEPENDS+= qt5-psql-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-psql
DEPENDS+= qt5-qtbase-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtbase
DEPENDS+= qt5-qtdeclarative-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtdeclarative
DEPENDS+= qt5-qtdoc-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtdoc
@@ -21,7 +17,6 @@ DEPENDS+= qt5-qtgraphicaleffects-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtgraphic
DEPENDS+= qt5-qtimageformats-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtimageformats
DEPENDS+= qt5-qtlocation-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtlocation
DEPENDS+= qt5-qtmultimedia-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtmultimedia
-DEPENDS+= qt5-qtquick1-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtquick1
DEPENDS+= qt5-qtquickcontrols-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtquickcontrols
DEPENDS+= qt5-qtscript-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtscript
DEPENDS+= qt5-qtsensors-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtsensors
@@ -30,10 +25,8 @@ DEPENDS+= qt5-qtsvg-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtsvg
DEPENDS+= qt5-qttools-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttools
DEPENDS+= qt5-qttranslations-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttranslations
DEPENDS+= qt5-qtwebchannel-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebchannel
-DEPENDS+= qt5-qtwebkit-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebkit
-DEPENDS+= qt5-websockets-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebsockets
+DEPENDS+= qt5-qtwebsockets-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebsockets
DEPENDS+= qt5-qtxmlpatterns-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtxmlpatterns
-DEPENDS+= qt5-sqlite3-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-sqlite3
.if ${OPSYS} == "Darwin"
DEPENDS+= qt5-qtmacextras-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtmacextras
.else
diff --git a/x11/qt5/Makefile.common b/x11/qt5/Makefile.common
index 54f79754077..e6eb0275f16 100644
--- a/x11/qt5/Makefile.common
+++ b/x11/qt5/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.5 2015/10/26 19:03:59 adam Exp $
-# used by x11/qt5-qtbase/Makefile.common
+# $NetBSD: Makefile.common,v 1.6 2018/01/17 19:30:46 markd Exp $
+# used by wip/qt5-qtbase/Makefile.common
# used by inputmethod/qt5-uim/Makefile
-QTVERSION= 5.5.1
+QTVERSION= 5.10.0
.include "../../mk/bsd.prefs.mk"