Update x11/qt5 to 5.4.1. Improvements included:

* Builds fine when another version being installed;
  * Start building documentation, HTML generator bug was fixed (patch is
    waiting for inclusion upstream);

This update do NOT include QtWebEngine: it relies on building from
Chromium sources (bundled with Qt5) and is a real pain to proceed; so lets
concentrate on what we already have.

All dependant ports are checked by building and running.

x11/qt5/Makefile

@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2015/04/04 09:21:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2015/04/19 13:18:28 zhuk Exp $
 
 SHARED_ONLY =		Yes
 ONLY_FOR_ARCHS =	${GCC4_ARCHS}
-IGNORE-html =		qdoc segfaults
-BROKEN-sparc64 =	tries to include a non-existent qatomic_sparc.h in src/corelib/thread/qbasicatomic.h
 
-VERSION =		5.3.2
+VERSION =		5.4.1
+ENGINIO_VERSION =	1.1.1
 DISTNAME =		qt-everywhere-opensource-src-${VERSION}
 
 COMMENT-main =		C++ general-purpose toolkit
@@ -13,6 +12,7 @@ COMMENT-examples =	examples for Qt5
 COMMENT-html =		offline HTML documentation for Qt5
 COMMENT-mysql =		MySQL plugin for Qt5
 COMMENT-psql =		PostgresSQL plugin for Qt5
+COMMENT-qch =		offline QCH documentation for Qt5
 COMMENT-sqlite2 =	SQLite 2.x plugin for Qt5
 COMMENT-tds =		TDS plugin for Qt5
 
@@ -21,65 +21,63 @@ PKGNAME-examples =	qt5-examples-${VERSION}
 PKGNAME-html =		qt5-html-${VERSION}
 PKGNAME-mysql =		qt5-mysql-${VERSION}
 PKGNAME-psql =		qt5-postgresql-${VERSION}
+PKGNAME-qch =		qt5-qch-${VERSION}
 PKGNAME-sqlite2 =	qt5-sqlite2-${VERSION}
 PKGNAME-tds =		qt5-tds-${VERSION}
 
-REVISION-main =		12
-REVISION-mysql =	1
-REVISION-psql =		1
-REVISION-sqlite2 =	1
-REVISION-tds =		1
-REVISION-examples =	0
-REVISION-html =		0
-
 PKG_ARCH-html =		*
+PKG_ARCH-qch =		*
 
 DPB_PROPERTIES =	parallel nojunk
 
-SHARED_LIBS =		Enginio			0.0
-SHARED_LIBS +=		Qt5Bluetooth		0.0
-SHARED_LIBS +=		Qt5CLucene		0.0
-SHARED_LIBS +=		Qt5Concurrent		0.0
-SHARED_LIBS +=		Qt5Core			0.0
-SHARED_LIBS +=		Qt5DBus			0.0
-SHARED_LIBS +=		Qt5Declarative		0.0
-SHARED_LIBS +=		Qt5Designer		0.0
-SHARED_LIBS +=		Qt5DesignerComponents	0.0
-SHARED_LIBS +=		Qt5Gui			0.0
-SHARED_LIBS +=		Qt5Help			0.0
-SHARED_LIBS +=		Qt5Multimedia		0.0
-SHARED_LIBS +=		Qt5MultimediaQuick_p	0.0
-SHARED_LIBS +=		Qt5MultimediaWidgets	0.0
-SHARED_LIBS +=		Qt5Network		0.0
-SHARED_LIBS +=		Qt5Nfc			0.0
-SHARED_LIBS +=		Qt5OpenGL		0.0
-SHARED_LIBS +=		Qt5Positioning		0.0
-SHARED_LIBS +=		Qt5PrintSupport		0.0
-SHARED_LIBS +=		Qt5Qml			0.0
-SHARED_LIBS +=		Qt5Quick		0.0
-SHARED_LIBS +=		Qt5QuickParticles	0.0
-SHARED_LIBS +=		Qt5QuickTest		0.0
-SHARED_LIBS +=		Qt5QuickWidgets		0.0
-SHARED_LIBS +=		Qt5Script		0.0
-SHARED_LIBS +=		Qt5ScriptTools		0.0
-SHARED_LIBS +=		Qt5Sensors		0.0
-SHARED_LIBS +=		Qt5SerialPort		0.0
-SHARED_LIBS +=		Qt5Sql			0.0
-SHARED_LIBS +=		Qt5Svg			0.0
-SHARED_LIBS +=		Qt5Test			0.0
-SHARED_LIBS +=		Qt5WebKit		0.0
-SHARED_LIBS +=		Qt5WebKitWidgets	0.0
-SHARED_LIBS +=		Qt5WebSockets		0.0
-SHARED_LIBS +=		Qt5Widgets		0.0
-SHARED_LIBS +=		Qt5X11Extras		0.0
-SHARED_LIBS +=		Qt5Xml			0.0
-SHARED_LIBS +=		Qt5XmlPatterns		0.0
+SHARED_LIBS =		Enginio			1.0
+SHARED_LIBS +=		Qt5Bluetooth		1.0
+SHARED_LIBS +=		Qt5CLucene		1.0
+SHARED_LIBS +=		Qt5Concurrent		1.0
+SHARED_LIBS +=		Qt5Core			1.0
+SHARED_LIBS +=		Qt5DBus			1.0
+SHARED_LIBS +=		Qt5Declarative		1.0
+SHARED_LIBS +=		Qt5Designer		1.0
+SHARED_LIBS +=		Qt5DesignerComponents	1.0
+SHARED_LIBS +=		Qt5Gui			1.0
+SHARED_LIBS +=		Qt5Help			1.0
+SHARED_LIBS +=		Qt5Multimedia		1.0
+SHARED_LIBS +=		Qt5MultimediaQuick_p	1.0
+SHARED_LIBS +=		Qt5MultimediaWidgets	1.0
+SHARED_LIBS +=		Qt5Network		1.0
+SHARED_LIBS +=		Qt5Nfc			1.0
+SHARED_LIBS +=		Qt5OpenGL		1.0
+SHARED_LIBS +=		Qt5Positioning		1.0
+SHARED_LIBS +=		Qt5PrintSupport		1.0
+SHARED_LIBS +=		Qt5Qml			1.0
+SHARED_LIBS +=		Qt5Quick		1.0
+SHARED_LIBS +=		Qt5QuickParticles	1.0
+SHARED_LIBS +=		Qt5QuickTest		1.0
+SHARED_LIBS +=		Qt5QuickWidgets		1.0
+SHARED_LIBS +=		Qt5Script		1.0
+SHARED_LIBS +=		Qt5ScriptTools		1.0
+SHARED_LIBS +=		Qt5Sensors		1.0
+SHARED_LIBS +=		Qt5SerialPort		1.0
+SHARED_LIBS +=		Qt5Sql			1.0
+SHARED_LIBS +=		Qt5Svg			1.0
+SHARED_LIBS +=		Qt5Test			1.0
+SHARED_LIBS +=		Qt5WebKit		1.0
+SHARED_LIBS +=		Qt5WebKitWidgets	1.0
+SHARED_LIBS +=		Qt5WebSockets		1.0
+SHARED_LIBS +=		Qt5Widgets		1.0
+SHARED_LIBS +=		Qt5X11Extras		1.0
+SHARED_LIBS +=		Qt5Xml			1.0
+SHARED_LIBS +=		Qt5XmlPatterns		1.0
 #SHARED_LIBS +=		qgsttools_p		0.0
 
-SHARED_LIBS-examples =	fftreal			0.0
-SHARED_LIBS-examples +=	gruesensor		0.0
+SHARED_LIBS-examples =	fftreal			1.0
+SHARED_LIBS-examples +=	gruesensor		1.0
 SHARED_LIBS +=		${SHARED_LIBS-examples}
 
+# since 5.4
+SHARED_LIBS +=		Qt5Location		0.0
+SHARED_LIBS +=		Qt5WebChannel		0.0
+
 CATEGORIES =		x11 devel
 HOMEPAGE =		http://www.qt-project.org/
 MAINTAINER =		KDE porting team <openbsd-kde@googlegroups.com>
@@ -88,8 +86,8 @@ MAINTAINER =		KDE porting team <openbsd-kde@googlegroups.com>
 WANTLIB-main =  ${WANTLIB}
 WANTLIB-main += EGL GL ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
 WANTLIB-main += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo
-WANTLIB-main += cups dbus-1 fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB-main += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gstapp-1.0
+WANTLIB-main += cups fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB-main += gio-2.0 glib-2.0 gobject-2.0 gstapp-1.0
 WANTLIB-main += gstaudio-1.0 gstbase-1.0 gstpbutils-1.0 gstreamer-1.0
 WANTLIB-main += gstvideo-1.0 gthread-2.0 gtk-x11-2.0 icudata icui18n
 WANTLIB-main += icuuc iodbc jasper jpeg m mng openal pango-1.0 pangocairo-1.0
@@ -114,6 +112,8 @@ WANTLIB-mysql +=	crypto m pthread mysqlclient_r ssl z
 WANTLIB-psql =		${MODGCC4_CPPWANTLIB} Qt5Core Qt5Sql
 WANTLIB-psql +=		m pthread pq
 
+WANTLIB-qch =
+
 WANTLIB-sqlite2 =	${MODGCC4_CPPWANTLIB} Qt5Core Qt5Sql
 WANTLIB-sqlite2 +=	m pthread sqlite
 
@@ -121,13 +121,14 @@ WANTLIB-tds =		${MODGCC4_CPPWANTLIB} Qt5Core Qt5Sql
 WANTLIB-tds +=		m pthread sybdb
 
 
-# Mostly LGPLv2.1 for code; FDLv1.3 for documentation.
+# Mostly LGPLv2.1 or LGPLv3 for code; FDLv1.3 for documentation.
 # Some third-party parts are BSD-licensed.
 # Also, many parts have are dual-licensed having either commercial, GPL,
 # Apache 2.0 or other type of license as an alternative option.
+# A few components, including QtWebEngine, are LGPLv3 only, no LGPLv2.1.
 PERMIT_PACKAGE_CDROM =	Yes
 
-MULTI_PACKAGES =	-main -examples -html -mysql -psql -sqlite2 -tds
+MULTI_PACKAGES =	-main -examples -html -mysql -psql -qch -sqlite2 -tds
 
 MASTER_SITES =		http://master.qt-project.org/archive/qt/${VERSION:R}/${VERSION}/single/
 
@@ -157,36 +158,41 @@ LIB_DEPENDS-main =	${LIB_DEPENDS} \
 			x11/gtk+2 \
 			x11/xkbcommon
 
-LIB_DEPENDS-examples =	${BUILD_PKGPATH},-main \
+LIB_DEPENDS-examples =	${BUILD_PKGPATH},-main>=${VERSION:R} \
 			${MODGCC4_CPPLIBDEP}
 
 LIB_DEPENDS-html =
 
-LIB_DEPENDS-mysql =	${BUILD_PKGPATH},-main \
+LIB_DEPENDS-mysql =	${BUILD_PKGPATH},-main>=${VERSION:R} \
 			${MODGCC4_CPPLIBDEP} \
 			databases/mariadb
 
-LIB_DEPENDS-psql =	${BUILD_PKGPATH},-main \
+LIB_DEPENDS-psql =	${BUILD_PKGPATH},-main>=${VERSION:R} \
 			${MODGCC4_CPPLIBDEP} \
 			databases/postgresql
 
-LIB_DEPENDS-sqlite2 =	${BUILD_PKGPATH},-main \
+LIB_DEPENDS-qch =
+
+LIB_DEPENDS-sqlite2 =	${BUILD_PKGPATH},-main>=${VERSION:R} \
 			${MODGCC4_CPPLIBDEP} \
 			databases/sqlite
 
-LIB_DEPENDS-tds =	${BUILD_PKGPATH},-main \
+LIB_DEPENDS-tds =	${BUILD_PKGPATH},-main>=${VERSION:R} \
 			${MODGCC4_CPPLIBDEP} \
 			databases/freetds
 
+BUILD_DEPENDS =		x11/dbus
 # QtWebKit & Co. requirements
-BUILD_DEPENDS =		devel/flex \
-			devel/bison
+BUILD_DEPENDS +=	devel/flex \
+			devel/bison \
 
-RUN_DEPENDS-main =
+RUN_DEPENDS-main =	${RUN_DEPENDS} \
+			x11/dbus
 RUN_DEPENDS-examples =
 RUN_DEPENDS-html =
 RUN_DEPENDS-mysql =
 RUN_DEPENDS-psql =
+RUN_DEPENDS-qch =
 RUN_DEPENDS-sqlite2 =
 RUN_DEPENDS-tds =
 
@@ -202,6 +208,7 @@ RUN_DEPENDS-main +=	devel/gperf \
 DESTDIRNAME =		INSTALL_ROOT
 
 MAKE_ENV =		LD_LIBRARY_PATH=${WRKBUILD}/qtbase/lib \
+			NINJA_PATH="${LOCALBASE}/bin/ninja" \
 			PYTHON=${MODPY_BIN} \
 			RUBY=${RUBY} \
 			REAL_BUILD_ROOT=${WRKBUILD} \
@@ -284,8 +291,14 @@ CONFIGURE_ENV += LDFLAGS="-Wl,--relax"
 # dependencies, so we'd better use the target qmake always creates
 # first, named "first".
 ALL_TARGET =		first
+FAKE_TARGET =		install
 .if ${BUILD_PACKAGES:M-html}
-ALL_TARGET +=		docs
+ALL_TARGET +=		html_docs
+FAKE_TARGET +=		install_html_docs
+.endif
+.if ${BUILD_PACKAGES:M-qch}
+ALL_TARGET +=		qch_docs
+FAKE_TARGET +=		install_qch_docs
 .endif
 
 .if !${BUILD_PACKAGES:M-examples}
@@ -336,7 +349,7 @@ TEST_DEPENDS =		${MODPY_RUN_DEPENDS} \
 
 PATCHORIG =		.ports.orig
 
-SUBST_VARS =		VERSION
+SUBST_VARS =		VERSION ENGINIO_VERSION
 
 post-extract:
 .if ${FLAVOR:Mno_examples}

x11/qt5/patches/patch-qtactiveqt_src_activeqt_activeqt_pro

@@ -0,0 +1,11 @@
+$OpenBSD: patch-qtactiveqt_src_activeqt_activeqt_pro,v 1.1 2015/04/19 13:18:28 zhuk Exp $
+Unbreak build of documentation.
+--- qtactiveqt/src/activeqt/activeqt.pro.ports.orig	Fri Apr 17 00:00:07 2015
++++ qtactiveqt/src/activeqt/activeqt.pro	Fri Apr 17 00:00:10 2015
+@@ -9,5 +9,6 @@ win32:!winrt {
+     # fake project for creating the documentation
+     TEMPLATE = aux
+     QMAKE_DOCS = $$PWD/doc/activeqt.qdocconf
++    tagfile = ../../doc/activeqt/activeqt.tags
+ }
+ 

x11/qt5/patches/patch-qtandroidextras_src_src_pro

@@ -0,0 +1,10 @@
+$OpenBSD: patch-qtandroidextras_src_src_pro,v 1.1 2015/04/19 13:18:28 zhuk Exp $
+Unbreak build of documentation.
+--- qtandroidextras/src/src.pro.ports.orig	Fri Apr 17 00:03:58 2015
++++ qtandroidextras/src/src.pro	Fri Apr 17 00:02:17 2015
+@@ -4,4 +4,5 @@ android {
+ } else {
+     TEMPLATE = aux
+     QMAKE_DOCS = $$PWD/androidextras/doc/qtandroidextras.qdocconf
++    tagfile = androidextras/doc/qtandroidextras.tags
+ }

x11/qt5/patches/patch-qtbase_configure

@@ -1,11 +1,11 @@
-$OpenBSD: patch-qtbase_configure,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtbase_configure,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 1. Tests fail due to incorrect _POSIX_TIMERS value in <unistd.h>.
    Allow functions to be actually used.
 2. Unbreak disabling build parts.
 3. Pass parameters to make(1) invocation.
---- qtbase/configure.ports.orig	Thu Sep 11 14:47:55 2014
-+++ qtbase/configure	Tue Nov 11 11:55:06 2014
-@@ -686,8 +686,8 @@ CFG_IWMMXT=no
+--- qtbase/configure.ports.orig	Tue Feb 17 07:56:22 2015
++++ qtbase/configure	Wed Apr  8 00:38:30 2015
+@@ -679,8 +679,8 @@ CFG_ACCESSIBILITY_ATSPI_BRIDGE=no # will be enabled de
  CFG_NEON=auto
  CFG_MIPS_DSP=auto
  CFG_MIPS_DSPR2=auto
@@ -16,7 +16,7 @@ $OpenBSD: patch-qtbase_configure,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
  CFG_POSIX_FALLOCATE=auto
  CFG_MREMAP=auto
  CFG_GETADDRINFO=auto
-@@ -3339,7 +3339,7 @@ if [ -z "$CFG_BUILD_PARTS" ]; then
+@@ -3388,7 +3388,7 @@ if [ -z "$CFG_BUILD_PARTS" ]; then
      fi
  fi
  for nobuild in $CFG_NOBUILD_PARTS; do
@@ -25,7 +25,7 @@ $OpenBSD: patch-qtbase_configure,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
  done
  if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then
  #    echo
-@@ -3782,7 +3782,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3831,7 +3831,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
          fi
      done
  

x11/qt5/patches/patch-qtbase_mkspecs_features_create_cmake_prf

@@ -1,9 +1,9 @@
-$OpenBSD: patch-qtbase_mkspecs_features_create_cmake_prf,v 1.2 2014/12/12 23:31:33 zhuk Exp $
+$OpenBSD: patch-qtbase_mkspecs_features_create_cmake_prf,v 1.3 2015/04/19 13:18:28 zhuk Exp $
 Make sure correct library filenames get propagated into CMake package
 config files.
---- qtbase/mkspecs/features/create_cmake.prf.ports.orig	Tue Dec  9 19:55:08 2014
-+++ qtbase/mkspecs/features/create_cmake.prf	Fri Dec 12 22:04:24 2014
-@@ -241,10 +241,16 @@ mac {
+--- qtbase/mkspecs/features/create_cmake.prf.ports.orig	Tue Feb 17 07:56:54 2015
++++ qtbase/mkspecs/features/create_cmake.prf	Wed Apr  8 00:38:30 2015
+@@ -246,10 +246,16 @@ mac {
          CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.so
          CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.so
          CMAKE_LIB_SONAME = lib$${CMAKE_QT_STEM}.so

x11/qt5/patches/patch-qtbase_qmake_Makefile_unix

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_qmake_Makefile_unix,v 1.1.1.1 2014/12/08 20:33:41 zhuk Exp $
+$OpenBSD: patch-qtbase_qmake_Makefile_unix,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Allow to build with OpenBSD make.
---- qtbase/qmake/Makefile.unix.ports.orig	Tue Nov 11 12:17:07 2014
-+++ qtbase/qmake/Makefile.unix	Tue Nov 11 12:21:05 2014
-@@ -105,6 +105,11 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
+--- qtbase/qmake/Makefile.unix.ports.orig	Tue Feb 17 07:56:37 2015
++++ qtbase/qmake/Makefile.unix	Wed Apr  8 00:38:30 2015
+@@ -107,6 +107,11 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
  
  CXXFLAGS = $(EXTRA_CXXFLAGS) $(CPPFLAGS)
  

x11/qt5/patches/patch-qtbase_qmake_generators_makefile_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_qmake_generators_makefile_cpp,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtbase_qmake_generators_makefile_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Don't special case GNU make, BSD make isn't that bad, too.
---- qtbase/qmake/generators/makefile.cpp.ports.orig	Tue Nov 11 12:08:36 2014
-+++ qtbase/qmake/generators/makefile.cpp	Tue Nov 11 12:08:47 2014
-@@ -685,7 +685,7 @@ MakefileGenerator::init()
+--- qtbase/qmake/generators/makefile.cpp.ports.orig	Tue Feb 17 07:56:37 2015
++++ qtbase/qmake/generators/makefile.cpp	Wed Apr  8 00:38:30 2015
+@@ -707,7 +707,7 @@ MakefileGenerator::init()
          }
      }
  

x11/qt5/patches/patch-qtbase_qmake_generators_unix_unixmake2_cpp

@@ -1,9 +1,9 @@
-$OpenBSD: patch-qtbase_qmake_generators_unix_unixmake2_cpp,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtbase_qmake_generators_unix_unixmake2_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 1. Un-hardcode system paths.
 2. Respect OpenBSD shared library naming rules.
---- qtbase/qmake/generators/unix/unixmake2.cpp.ports.orig	Mon Nov  3 17:43:42 2014
-+++ qtbase/qmake/generators/unix/unixmake2.cpp	Tue Nov  4 14:06:19 2014
-@@ -83,6 +83,10 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t)
+--- qtbase/qmake/generators/unix/unixmake2.cpp.ports.orig	Tue Feb 17 07:56:37 2015
++++ qtbase/qmake/generators/unix/unixmake2.cpp	Wed Apr  8 00:38:30 2015
+@@ -75,6 +75,10 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t)
      if (writeDummyMakefile(t))
          return true;
  
@@ -14,7 +14,7 @@ $OpenBSD: patch-qtbase_qmake_generators_unix_unixmake2_cpp,v 1.1.1.1 2014/12/08
      if (project->values("TEMPLATE").first() == "app" ||
          project->values("TEMPLATE").first() == "lib" ||
          project->values("TEMPLATE").first() == "aux") {
-@@ -235,13 +239,20 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -283,13 +287,20 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
              t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y")) << endl;
              t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
          } else if (!project->isActiveConfig("unversioned_libname")) {
@@ -41,7 +41,7 @@ $OpenBSD: patch-qtbase_qmake_generators_unix_unixmake2_cpp,v 1.1.1.1 2014/12/08
              }
          }
      }
-@@ -574,7 +585,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -615,7 +626,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
              if(!project->isEmpty("QMAKE_POST_LINK"))
                  t << "\n\t" << var("QMAKE_POST_LINK");
              t << endl << endl;
@@ -51,7 +51,7 @@ $OpenBSD: patch-qtbase_qmake_generators_unix_unixmake2_cpp,v 1.1.1.1 2014/12/08
              t << "\n\t";
  
              if (!project->isActiveConfig("unversioned_libname"))
-@@ -608,7 +620,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -649,7 +661,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
              if(!project->isEmpty("QMAKE_POST_LINK"))
                  t << "\n\t" << var("QMAKE_POST_LINK");
              t << endl << endl;
@@ -74,7 +74,7 @@ $OpenBSD: patch-qtbase_qmake_generators_unix_unixmake2_cpp,v 1.1.1.1 2014/12/08
              t << "\n\t"
                << "-$(DEL_FILE) $(TARGET) $(TARGET0)\n\t"
                << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
-@@ -1125,6 +1152,11 @@ void UnixMakefileGenerator::init2()
+@@ -1199,6 +1226,11 @@ void UnixMakefileGenerator::init2()
                  project->values("TARGET_x").append("lib" + project->first("TARGET") + "." +
                                                          project->first("VER_MAJ"));
              project->values("TARGET") = project->values("TARGET_x");
@@ -86,7 +86,7 @@ $OpenBSD: patch-qtbase_qmake_generators_unix_unixmake2_cpp,v 1.1.1.1 2014/12/08
          } else if (!project->isEmpty("QMAKE_AIX_SHLIB")) {
              project->values("TARGET_").append(project->first("QMAKE_PREFIX_STATICLIB") + project->first("TARGET")
                      + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
-@@ -1348,17 +1380,27 @@ UnixMakefileGenerator::writeLibtoolFile()
+@@ -1391,17 +1423,27 @@ UnixMakefileGenerator::writeLibtoolFile()
      t << "\n";
  
      t << "# The name that we can dlopen(3).\n"

x11/qt5/patches/patch-qtbase_qmake_generators_unix_unixmake_cpp

@@ -1,12 +1,40 @@
-$OpenBSD: patch-qtbase_qmake_generators_unix_unixmake_cpp,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtbase_qmake_generators_unix_unixmake_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 1. Always prepend project directory to list of linking directories,
    to avoid picking up wrong library from system.
 2. Try to avoid picking up system libraries instead of locally built ones.
 3. Don't special case GNU make, BSD make isn't that bad, too.
 4. Respect OpenBSD shared library naming rules.
---- qtbase/qmake/generators/unix/unixmake.cpp.ports.orig	Thu Sep 11 14:48:00 2014
-+++ qtbase/qmake/generators/unix/unixmake.cpp	Mon Dec  8 14:32:38 2014
-@@ -150,6 +150,10 @@ UnixMakefileGenerator::init()
+--- qtbase/qmake/generators/unix/unixmake.cpp.ports.orig	Tue Feb 17 07:56:37 2015
++++ qtbase/qmake/generators/unix/unixmake.cpp	Sun Apr 19 00:14:44 2015
+@@ -42,7 +42,27 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++// Helper for putting -L for in-build-tree directories first, all other arguments later;
++// avoids picking up system libraries instead of built ones.
+ void
++UnixMakefileGenerator::separateInternalLibdirs(ProStringList &libs, ProStringList &libdirsInt, QString prefix) {
++    QFileInfo fi(project->cacheFile().isEmpty() ? project->buildRoot() : project->cacheFile());
++    QFileInfo fi2(fi.dir().path());
++    QDir dir(fi2.dir().path());
++    QString lbroot(prefix + (dir.isRoot() ? project->buildRoot() : dir.path()) + QDir::separator());
++    for (int i = 0; i < libs.size();) {
++        QString l(libs[i].toQString());
++        if (l.startsWith(lbroot)) {
++            if (!libdirsInt.contains(l))
++                libdirsInt += l;
++            libs.remove(i);
++        } else {
++            ++i;
++        }
++    }
++}
++
++void
+ UnixMakefileGenerator::init()
+ {
+     if(init_flag)
+@@ -144,6 +164,10 @@ UnixMakefileGenerator::init()
                : project->isActiveConfig("ti_linker") ? "--search_path="
                : "-L");
      ProStringList ldadd;
@@ -17,7 +45,7 @@ $OpenBSD: patch-qtbase_qmake_generators_unix_unixmake_cpp,v 1.1.1.1 2014/12/08 2
      if(!project->isEmpty("QMAKE_LIBDIR")) {
          const ProStringList &libdirs = project->values("QMAKE_LIBDIR");
          for(int i = 0; i < libdirs.size(); ++i) {
-@@ -167,8 +171,34 @@ UnixMakefileGenerator::init()
+@@ -161,8 +185,16 @@ UnixMakefileGenerator::init()
          }
          ldadd += project->values("QMAKE_FRAMEWORKPATH_FLAGS");
      }
@@ -26,34 +54,27 @@ $OpenBSD: patch-qtbase_qmake_generators_unix_unixmake_cpp,v 1.1.1.1 2014/12/08 2
 +    // avoids picking up system libraries instead of built ones.
      ProStringList &qmklibs = project->values("QMAKE_LIBS");
 -    qmklibs = ldadd + qmklibs;
-+    ProStringList nqmklibs;
-+    QString lbroot = "-L" + project->buildRoot() + "/";
-+    for (int i = 0; i < ldadd.size(); ++i) {
-+        QString l = ldadd[i].toQString();
-+        if (l.startsWith(lbroot))
-+            nqmklibs += l;
-+    }
-+    for (int i = 0; i < qmklibs.size(); ++i) {
-+        QString l = qmklibs[i].toQString();
-+        if (l.startsWith(lbroot))
-+            nqmklibs += l;
-+    }
-+    for (int i = 0; i < ldadd.size(); ++i) {
-+        QString l = ldadd[i].toQString();
-+        if (!l.startsWith(lbroot))
-+            nqmklibs += l;
-+    }
-+    for (int i = 0; i < qmklibs.size(); ++i) {
-+        QString l = qmklibs[i].toQString();
-+        if (!l.startsWith(lbroot))
-+            nqmklibs += l;
-+    }
-+    qmklibs = nqmklibs;
++    qmklibs += ldadd;
++    ProStringList libdirsInternal;
++    separateInternalLibdirs(qmklibs, libdirsInternal, QString::fromLatin1("-L"));
++    separateInternalLibdirs(project->values("QMAKE_LIBS_PRIVATE"), libdirsInternal, QString::fromLatin1("-L"));
++    qmklibs = libdirsInternal + qmklibs;
 +
-     if(!project->isEmpty("QMAKE_RPATHDIR")) {
+     if (!project->isEmpty("QMAKE_RPATHDIR") && !project->isEmpty("QMAKE_LFLAGS_RPATH")) {
          const ProStringList &rpathdirs = project->values("QMAKE_RPATHDIR");
-         for(int i = 0; i < rpathdirs.size(); ++i) {
-@@ -184,7 +214,7 @@ UnixMakefileGenerator::init()
+         for (int i = 0; i < rpathdirs.size(); ++i) {
+@@ -173,14 +205,17 @@ UnixMakefileGenerator::init()
+         }
+     }
+     if (!project->isEmpty("QMAKE_RPATHLINKDIR")) {
+-        const ProStringList &rpathdirs = project->values("QMAKE_RPATHLINKDIR");
++        ProStringList &rpathdirs = project->values("QMAKE_RPATHLINKDIR");
++        ProStringList rpathdirsInternal;
++        separateInternalLibdirs(rpathdirs, rpathdirsInternal, QString());
++        rpathdirs = rpathdirsInternal + rpathdirs;
+         for (int i = 0; i < rpathdirs.size(); ++i) {
+             if (!project->isEmpty("QMAKE_LFLAGS_RPATHLINK"))
+                 project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATHLINK") + escapeFilePath(QFileInfo(rpathdirs[i].toQString()).absoluteFilePath());
          }
      }
  
@@ -62,7 +83,31 @@ $OpenBSD: patch-qtbase_qmake_generators_unix_unixmake_cpp,v 1.1.1.1 2014/12/08 2
          include_deps = true; //do not generate deps
      if(project->isActiveConfig("compile_libtool"))
          Option::obj_ext = ".lo"; //override the .o
-@@ -748,7 +778,8 @@ UnixMakefileGenerator::defaultInstall(const QString &t
+@@ -576,6 +611,9 @@ UnixMakefileGenerator::processPrlFiles()
+     static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
+     for (int i = 0; lflags[i]; i++) {
+         ProStringList &l = project->values(lflags[i]);
++        ProStringList libdirsInt;
++        separateInternalLibdirs(l, libdirsInt, libArg);
++        l = libdirsInt + l;
+         for(int lit = 0; lit < l.size(); ++lit) {
+             QString opt = l.at(lit).trimmed().toQString();
+             if(opt.startsWith("-")) {
+@@ -714,6 +752,13 @@ UnixMakefileGenerator::processPrlFiles()
+             }
+         }
+     }
++    ProStringList libdirsInt;
++    for (int i = 0; lflags[i]; i++) {
++        ProStringList &l = project->values(lflags[i]);
++        separateInternalLibdirs(l, libdirsInt, libArg);
++    }
++    ProStringList &libs = project->values("QMAKE_LIBS");
++    libs = libdirsInt + libs;
+ }
+ 
+ QString
+@@ -742,7 +787,8 @@ UnixMakefileGenerator::defaultInstall(const QString &t
      } else if(project->first("TEMPLATE") == "app") {
          target = "$(QMAKE_TARGET)";
      } else if(project->first("TEMPLATE") == "lib") {

x11/qt5/patches/patch-qtbase_qmake_generators_unix_unixmake_h

@@ -0,0 +1,13 @@
+$OpenBSD: patch-qtbase_qmake_generators_unix_unixmake_h,v 1.1 2015/04/19 13:18:28 zhuk Exp $
+Always prepend project directory to list of linking directories,
+to avoid picking up wrong library from system.
+--- qtbase/qmake/generators/unix/unixmake.h.ports.orig	Fri Apr 17 20:16:34 2015
++++ qtbase/qmake/generators/unix/unixmake.h	Fri Apr 17 20:38:27 2015
+@@ -68,6 +68,7 @@ class UnixMakefileGenerator : public MakefileGenerator
+ 
+ private:
+     void init2();
++    void separateInternalLibdirs(ProStringList &libs, ProStringList &libdirsInt, QString prefix);
+ };
+ 
+ inline UnixMakefileGenerator::~UnixMakefileGenerator()

x11/qt5/patches/patch-qtbase_src_concurrent_qtconcurrentiteratekernel_cpp

@@ -1,9 +1,9 @@
-$OpenBSD: patch-qtbase_src_concurrent_qtconcurrentiteratekernel_cpp,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtbase_src_concurrent_qtconcurrentiteratekernel_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Tests fail due to incorrect _POSIX_TIMERS value in <unistd.h>.
 Allow functions to be actually used.
---- qtbase/src/concurrent/qtconcurrentiteratekernel.cpp.ports.orig	Mon Nov  3 22:55:57 2014
-+++ qtbase/src/concurrent/qtconcurrentiteratekernel.cpp	Mon Nov  3 22:56:56 2014
-@@ -79,7 +79,7 @@ static qint64 getticks()
+--- qtbase/src/concurrent/qtconcurrentiteratekernel.cpp.ports.orig	Tue Feb 17 07:56:53 2015
++++ qtbase/src/concurrent/qtconcurrentiteratekernel.cpp	Wed Apr  8 00:38:30 2015
+@@ -71,7 +71,7 @@ static qint64 getticks()
  
  static qint64 getticks()
  {

x11/qt5/patches/patch-qtbase_src_corelib_io_qfilesystemwatcher_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_corelib_io_qfilesystemwatcher_cpp,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtbase_src_corelib_io_qfilesystemwatcher_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Enable kqueue(2) backend.
---- qtbase/src/corelib/io/qfilesystemwatcher.cpp.ports.orig	Mon Nov  3 22:53:31 2014
-+++ qtbase/src/corelib/io/qfilesystemwatcher.cpp	Mon Nov  3 22:53:50 2014
-@@ -60,7 +60,7 @@
+--- qtbase/src/corelib/io/qfilesystemwatcher.cpp.ports.orig	Tue Feb 17 07:56:51 2015
++++ qtbase/src/corelib/io/qfilesystemwatcher.cpp	Wed Apr  8 00:38:30 2015
+@@ -52,7 +52,7 @@
  #  include "qfilesystemwatcher_win_p.h"
  #elif defined(USE_INOTIFY)
  #  include "qfilesystemwatcher_inotify_p.h"

x11/qt5/patches/patch-qtbase_src_corelib_kernel_qcore_unix_p_h

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_corelib_kernel_qcore_unix_p_h,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtbase_src_corelib_kernel_qcore_unix_p_h,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Unbreak compilation.
---- qtbase/src/corelib/kernel/qcore_unix_p.h.ports.orig	Sun Nov  2 17:11:43 2014
-+++ qtbase/src/corelib/kernel/qcore_unix_p.h	Sun Nov  2 17:11:57 2014
-@@ -62,6 +62,7 @@
+--- qtbase/src/corelib/kernel/qcore_unix_p.h.ports.orig	Tue Feb 17 07:56:50 2015
++++ qtbase/src/corelib/kernel/qcore_unix_p.h	Wed Apr  8 00:38:30 2015
+@@ -54,6 +54,7 @@
  
  #include <string.h>
  #include <sys/types.h>

x11/qt5/patches/patch-qtbase_src_corelib_thread_qbasicatomic_h

@@ -1,13 +0,0 @@
-$OpenBSD: patch-qtbase_src_corelib_thread_qbasicatomic_h,v 1.1 2015/01/24 22:09:40 zhuk Exp $
-Allow Qt 5.2+ to compile on SPARC.
---- qtbase/src/corelib/thread/qbasicatomic.h.ports.orig	Sun Jan 25 01:03:17 2015
-+++ qtbase/src/corelib/thread/qbasicatomic.h	Sun Jan 25 01:03:46 2015
-@@ -62,8 +62,6 @@
- #  include "QtCore/qatomic_ia64.h"
- #elif defined(Q_PROCESSOR_MIPS)
- #  include "QtCore/qatomic_mips.h"
--#elif defined(Q_PROCESSOR_SPARC)
--#  include "QtCore/qatomic_sparc.h"
- #elif defined(Q_PROCESSOR_X86)
- #  include <QtCore/qatomic_x86.h>
- 

x11/qt5/patches/patch-qtbase_src_corelib_tools_qbytearray_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_corelib_tools_qbytearray_cpp,v 1.1 2014/12/13 05:47:37 zhuk Exp $
+$OpenBSD: patch-qtbase_src_corelib_tools_qbytearray_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Get rid of strcpy().
---- qtbase/src/corelib/tools/qbytearray.cpp.ports.orig	Fri Dec 12 15:52:43 2014
-+++ qtbase/src/corelib/tools/qbytearray.cpp	Sat Dec 13 00:47:23 2014
-@@ -108,12 +108,15 @@ int qAllocMore(int alloc, int extra)
+--- qtbase/src/corelib/tools/qbytearray.cpp.ports.orig	Tue Feb 17 07:56:49 2015
++++ qtbase/src/corelib/tools/qbytearray.cpp	Wed Apr  8 00:38:30 2015
+@@ -90,12 +90,15 @@ int qAllocMore(int alloc, int extra) Q_DECL_NOTHROW
  
  char *qstrdup(const char *src)
  {
@@ -20,7 +20,7 @@ Get rid of strcpy().
  /*! \relates QByteArray
  
      Copies all the characters up to and including the '\\0' from \a
-@@ -141,6 +144,7 @@ char *qstrcpy(char *dst, const char *src)
+@@ -123,6 +126,7 @@ char *qstrcpy(char *dst, const char *src)
      return strcpy(dst, src);
  #endif
  }
@@ -28,7 +28,7 @@ Get rid of strcpy().
  
  /*! \relates QByteArray
  
-@@ -157,8 +161,6 @@ char *qstrcpy(char *dst, const char *src)
+@@ -139,8 +143,6 @@ char *qstrcpy(char *dst, const char *src)
      \note When compiling with Visual C++ compiler version 14.00
      (Visual C++ 2005) or later, internally the function strncpy_s
      will be used.

x11/qt5/patches/patch-qtbase_src_corelib_tools_qbytearray_h

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_corelib_tools_qbytearray_h,v 1.1 2014/12/13 05:47:37 zhuk Exp $
+$OpenBSD: patch-qtbase_src_corelib_tools_qbytearray_h,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Get rid of strcpy().
---- qtbase/src/corelib/tools/qbytearray.h.ports.orig	Sat Dec 13 00:45:40 2014
-+++ qtbase/src/corelib/tools/qbytearray.h	Sat Dec 13 00:46:00 2014
-@@ -94,7 +94,9 @@ inline uint qstrnlen(const char *str, uint maxlen)
+--- qtbase/src/corelib/tools/qbytearray.h.ports.orig	Tue Feb 17 07:56:49 2015
++++ qtbase/src/corelib/tools/qbytearray.h	Wed Apr  8 00:38:30 2015
+@@ -88,7 +88,9 @@ inline uint qstrnlen(const char *str, uint maxlen)
      return length;
  }
  

x11/qt5/patches/patch-qtbase_src_gui_image_qxbmhandler_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_gui_image_qxbmhandler_cpp,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtbase_src_gui_image_qxbmhandler_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Avoid confusing warning from linker.
---- qtbase/src/gui/image/qxbmhandler.cpp.ports.orig	Tue Nov  4 17:46:54 2014
-+++ qtbase/src/gui/image/qxbmhandler.cpp	Tue Nov  4 17:47:50 2014
-@@ -240,11 +240,7 @@ static bool write_xbm_image(const QImage &sourceImage,
+--- qtbase/src/gui/image/qxbmhandler.cpp.ports.orig	Tue Feb 17 07:56:48 2015
++++ qtbase/src/gui/image/qxbmhandler.cpp	Wed Apr  8 00:38:30 2015
+@@ -232,11 +232,7 @@ static bool write_xbm_image(const QImage &sourceImage,
              }
          }
      }

x11/qt5/patches/patch-qtbase_src_network_kernel_qdnslookup_unix_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_network_kernel_qdnslookup_unix_cpp,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtbase_src_network_kernel_qdnslookup_unix_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Unbreak compilation.
---- qtbase/src/network/kernel/qdnslookup_unix.cpp.ports.orig	Sun Nov  2 17:28:49 2014
-+++ qtbase/src/network/kernel/qdnslookup_unix.cpp	Sun Nov  2 18:29:57 2014
-@@ -49,7 +49,9 @@
+--- qtbase/src/network/kernel/qdnslookup_unix.cpp.ports.orig	Tue Feb 17 07:56:38 2015
++++ qtbase/src/network/kernel/qdnslookup_unix.cpp	Wed Apr  8 00:38:30 2015
+@@ -41,7 +41,9 @@
  #include <sys/types.h>
  #include <netinet/in.h>
  #include <arpa/nameser.h>
@@ -13,7 +13,7 @@ Unbreak compilation.
  #include <resolv.h>
  
  #if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__)
-@@ -59,6 +61,8 @@
+@@ -51,6 +53,8 @@
  QT_BEGIN_NAMESPACE
  
  #ifndef QT_NO_LIBRARY

x11/qt5/patches/patch-qtbase_src_network_kernel_qnetworkinterface_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_network_kernel_qnetworkinterface_cpp,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtbase_src_network_kernel_qnetworkinterface_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Avoid confusing warning from linker.
---- qtbase/src/network/kernel/qnetworkinterface.cpp.ports.orig	Tue Nov  4 17:53:00 2014
-+++ qtbase/src/network/kernel/qnetworkinterface.cpp	Tue Nov  4 17:53:57 2014
-@@ -133,7 +133,7 @@ QString QNetworkInterfacePrivate::makeHwAddress(int le
+--- qtbase/src/network/kernel/qnetworkinterface.cpp.ports.orig	Tue Feb 17 07:56:38 2015
++++ qtbase/src/network/kernel/qnetworkinterface.cpp	Wed Apr  8 00:38:30 2015
+@@ -125,7 +125,7 @@ QString QNetworkInterfacePrivate::makeHwAddress(int le
  #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && defined(_MSC_VER) && _MSC_VER >= 1400
          sprintf_s(buf, 3, "%02hX", ushort(data[i]));
  #else

x11/qt5/patches/patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtbase_src_network_socket_qnativesocketengine_unix_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Unbreak compilation.
---- qtbase/src/network/socket/qnativesocketengine_unix.cpp.ports.orig	Sun Nov  2 17:26:25 2014
-+++ qtbase/src/network/socket/qnativesocketengine_unix.cpp	Sun Nov  2 17:27:13 2014
-@@ -604,7 +604,9 @@ int QNativeSocketEnginePrivate::nativeAccept()
+--- qtbase/src/network/socket/qnativesocketengine_unix.cpp.ports.orig	Tue Feb 17 07:56:38 2015
++++ qtbase/src/network/socket/qnativesocketengine_unix.cpp	Wed Apr  8 00:38:30 2015
+@@ -622,7 +622,9 @@ int QNativeSocketEnginePrivate::nativeAccept()
              setError(QAbstractSocket::SocketResourceError, NotSocketErrorString);
              break;
          case EPROTONOSUPPORT:

x11/qt5/patches/patch-qtbase_src_network_ssl_qsslsocket_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_network_ssl_qsslsocket_cpp,v 1.1 2015/01/20 13:27:59 zhuk Exp $
+$OpenBSD: patch-qtbase_src_network_ssl_qsslsocket_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Use the only valid SSL certs source on OpenBSD.
---- qtbase/src/network/ssl/qsslsocket.cpp.ports.orig	Tue Jan 20 16:18:22 2015
-+++ qtbase/src/network/ssl/qsslsocket.cpp	Tue Jan 20 16:20:12 2015
-@@ -2438,15 +2438,7 @@ bool QSslSocketPrivate::rootCertOnDemandLoadingSupport
+--- qtbase/src/network/ssl/qsslsocket.cpp.ports.orig	Tue Feb 17 07:56:38 2015
++++ qtbase/src/network/ssl/qsslsocket.cpp	Wed Apr  8 00:38:30 2015
+@@ -2481,15 +2481,7 @@ bool QSslSocketPrivate::rootCertOnDemandLoadingSupport
  */
  QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
  {

x11/qt5/patches/patch-qtbase_src_platformheaders_platformheaders_pro

@@ -0,0 +1,12 @@
+$OpenBSD: patch-qtbase_src_platformheaders_platformheaders_pro,v 1.1 2015/04/19 13:18:28 zhuk Exp $
+Unbreak build of documentation.
+--- qtbase/src/platformheaders/platformheaders.pro.ports.orig	Fri Apr 17 00:03:39 2015
++++ qtbase/src/platformheaders/platformheaders.pro	Fri Apr 17 00:02:47 2015
+@@ -8,6 +8,7 @@ include(xcbfunctions/xcbfunctions.pri)
+ include(eglfsfunctions/eglfsfunctions.pri)
+ 
+ QMAKE_DOCS = $$PWD/doc/qtplatformheaders.qdocconf
++tagfile = doc/qtplatformheaders.tags
+ 
+ load(qt_module_headers)
+ load(qt_docs)

x11/qt5/patches/patch-qtbase_src_plugins_platforms_xcb_qxcbbackingstore_cpp

@@ -1,24 +0,0 @@
-$OpenBSD: patch-qtbase_src_plugins_platforms_xcb_qxcbbackingstore_cpp,v 1.1 2015/01/15 11:10:02 zhuk Exp $
-Fix use-after-free bug.
-Upstream commit: https://qt.gitorious.org/qt/qtbase/commit/d40b66a8ef98777c69ac293dac9a332f88832c23
-Bug report: https://bugreports.qt-project.org/browse/QTBUG-43623
---- qtbase/src/plugins/platforms/xcb/qxcbbackingstore.cpp.ports.orig	Thu Jan 15 14:05:24 2015
-+++ qtbase/src/plugins/platforms/xcb/qxcbbackingstore.cpp	Thu Jan 15 14:05:42 2015
-@@ -153,8 +153,6 @@ void QXcbShmImage::destroy()
-     if (segmentSize && m_shm_info.shmaddr)
-         Q_XCB_CALL(xcb_shm_detach(xcb_connection(), m_shm_info.shmseg));
- 
--    xcb_image_destroy(m_xcb_image);
--
-     if (segmentSize) {
-         if (m_shm_info.shmaddr) {
-             shmdt(m_shm_info.shmaddr);
-@@ -163,6 +161,8 @@ void QXcbShmImage::destroy()
-             free(m_xcb_image->data);
-         }
-     }
-+
-+    xcb_image_destroy(m_xcb_image);
- 
-     if (m_gc)
-         Q_XCB_CALL(xcb_free_gc(xcb_connection(), m_gc));

x11/qt5/patches/patch-qtbase_src_testlib_qtestcase_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_testlib_qtestcase_cpp,v 1.1 2014/12/20 12:15:34 zhuk Exp $
+$OpenBSD: patch-qtbase_src_testlib_qtestcase_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Get rid of qstrcpy.
---- qtbase/src/testlib/qtestcase.cpp.ports.orig	Sat Dec 13 01:37:06 2014
-+++ qtbase/src/testlib/qtestcase.cpp	Sat Dec 13 01:37:34 2014
-@@ -2982,8 +2982,7 @@ char *QTest::toString(const char *str)
+--- qtbase/src/testlib/qtestcase.cpp.ports.orig	Tue Feb 17 07:56:53 2015
++++ qtbase/src/testlib/qtestcase.cpp	Wed Apr  8 00:38:30 2015
+@@ -2994,8 +2994,7 @@ char *QTest::toString(const char *str)
  {
      if (!str)
          return 0;

x11/qt5/patches/patch-qtbase_src_tools_qdoc_htmlgenerator_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-qtbase_src_tools_qdoc_htmlgenerator_cpp,v 1.1 2015/04/19 13:18:28 zhuk Exp $
+Unbreak build of documentation.
+BUG: https://bugreports.qt.io/browse/QTBUG-45643
+--- qtbase/src/tools/qdoc/htmlgenerator.cpp.ports.orig	Thu Apr 16 12:08:37 2015
++++ qtbase/src/tools/qdoc/htmlgenerator.cpp	Thu Apr 16 20:54:07 2015
+@@ -3378,7 +3378,8 @@ QString HtmlGenerator::highlightedCode(const QString& 
+             bool handled = false;
+             for (int k = 0; k != 18; ++k) {
+                 const QString & tag = spanTags[2 * k];
+-                if (tag == QStringRef(&src, i, tag.length())) {
++                if (i + tag.length() <= src.length() &&
++                        tag == QStringRef(&src, i, tag.length())) {
+                     html += spanTags[2 * k + 1];
+                     i += tag.length();
+                     handled = true;

x11/qt5/patches/patch-qtbase_src_tools_qdoc_tokenizer_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_tools_qdoc_tokenizer_cpp,v 1.1 2014/12/13 05:47:37 zhuk Exp $
+$OpenBSD: patch-qtbase_src_tools_qdoc_tokenizer_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Get rid of strcpy().
---- qtbase/src/tools/qdoc/tokenizer.cpp.ports.orig	Sat Dec 13 00:40:41 2014
-+++ qtbase/src/tools/qdoc/tokenizer.cpp	Sat Dec 13 00:45:04 2014
-@@ -490,7 +490,7 @@ int Tokenizer::getToken()
+--- qtbase/src/tools/qdoc/tokenizer.cpp.ports.orig	Tue Feb 17 07:56:38 2015
++++ qtbase/src/tools/qdoc/tokenizer.cpp	Wed Apr  8 00:38:30 2015
+@@ -482,7 +482,7 @@ int Tokenizer::getToken()
          }
      }
  
@@ -11,7 +11,7 @@ Get rid of strcpy().
      yyLexLen = strlen(yyLex);
      return Tok_Eoi;
  }
-@@ -580,8 +580,8 @@ void Tokenizer::start(const Location& loc)
+@@ -572,8 +572,8 @@ void Tokenizer::start(const Location& loc)
      yyTokLoc = loc;
      yyCurLoc = loc;
      yyCurLoc.start();
@@ -22,7 +22,7 @@ Get rid of strcpy().
      yyLexLen = strlen(yyLex);
      yyBraceDepth = 0;
      yyParenDepth = 0;
-@@ -673,7 +673,7 @@ int Tokenizer::getTokenAfterPreprocessor()
+@@ -665,7 +665,7 @@ int Tokenizer::getTokenAfterPreprocessor()
            yyPrevLex. This way, we skip over the preprocessor
            directive.
          */

x11/qt5/patches/patch-qtbase_src_widgets_styles_qgtk2painter_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_widgets_styles_qgtk2painter_cpp,v 1.1 2014/12/25 23:35:44 zhuk Exp $
+$OpenBSD: patch-qtbase_src_widgets_styles_qgtk2painter_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Fix Qt5 in situation GTK+ shared library version is overridden.
---- qtbase/src/widgets/styles/qgtk2painter.cpp.ports.orig	Fri Dec 26 02:24:43 2014
-+++ qtbase/src/widgets/styles/qgtk2painter.cpp	Fri Dec 26 02:25:21 2014
-@@ -103,8 +103,7 @@ static void initGtk()
+--- qtbase/src/widgets/styles/qgtk2painter.cpp.ports.orig	Tue Feb 17 07:56:39 2015
++++ qtbase/src/widgets/styles/qgtk2painter.cpp	Wed Apr  8 00:38:30 2015
+@@ -95,8 +95,7 @@ static void initGtk()
  {
      static bool initialized = false;
      if (!initialized) {

x11/qt5/patches/patch-qtbase_src_widgets_styles_qgtkstyle_p_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_src_widgets_styles_qgtkstyle_p_cpp,v 1.1 2014/12/25 23:35:44 zhuk Exp $
+$OpenBSD: patch-qtbase_src_widgets_styles_qgtkstyle_p_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Fix Qt5 in situation GTK+ shared library version is overridden.
---- qtbase/src/widgets/styles/qgtkstyle_p.cpp.ports.orig	Fri Dec 26 02:21:40 2014
-+++ qtbase/src/widgets/styles/qgtkstyle_p.cpp	Fri Dec 26 02:25:50 2014
-@@ -333,8 +333,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *wi
+--- qtbase/src/widgets/styles/qgtkstyle_p.cpp.ports.orig	Tue Feb 17 07:56:39 2015
++++ qtbase/src/widgets/styles/qgtkstyle_p.cpp	Wed Apr  8 00:38:30 2015
+@@ -325,8 +325,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *wi
   */
  void QGtkStylePrivate::resolveGtk() const
  {
@@ -12,7 +12,7 @@ Fix Qt5 in situation GTK+ shared library version is overridden.
  
      gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
      gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
-@@ -432,8 +431,8 @@ void QGtkStylePrivate::resolveGtk() const
+@@ -424,8 +423,8 @@ void QGtkStylePrivate::resolveGtk() const
      pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family");
      pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style");
  
@@ -23,7 +23,7 @@ Fix Qt5 in situation GTK+ shared library version is overridden.
  }
  
  /* \internal
-@@ -601,9 +600,9 @@ void QGtkStylePrivate::cleanupGtkWidgets()
+@@ -593,9 +592,9 @@ void QGtkStylePrivate::cleanupGtkWidgets()
  static bool resolveGConf()
  {
      if (!QGtkStylePrivate::gconf_client_get_default) {

x11/qt5/patches/patch-qtbase_tests_auto_corelib_tools_qbytearray_tst_qbytearray_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtbase_tests_auto_corelib_tools_qbytearray_tst_qbytearray_cpp,v 1.1 2014/12/13 05:47:37 zhuk Exp $
+$OpenBSD: patch-qtbase_tests_auto_corelib_tools_qbytearray_tst_qbytearray_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Get rid of strcpy().
---- qtbase/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp.ports.orig	Sat Dec 13 00:40:19 2014
-+++ qtbase/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp	Sat Dec 13 00:39:38 2014
-@@ -84,7 +84,9 @@ private slots:
+--- qtbase/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp.ports.orig	Tue Feb 17 07:56:31 2015
++++ qtbase/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp	Wed Apr  8 00:38:30 2015
+@@ -76,7 +76,9 @@ private slots:
      void qvsnprintf();
      void qstrlen();
      void qstrnlen();
@@ -12,7 +12,7 @@ Get rid of strcpy().
      void qstrncpy();
      void qstricmp_data();
      void qstricmp();
-@@ -766,6 +768,7 @@ void tst_QByteArray::qstrnlen()
+@@ -762,6 +764,7 @@ void tst_QByteArray::qstrnlen()
      QCOMPARE(::qstrnlen(src, 20), (uint)20);
  }
  
@@ -20,7 +20,7 @@ Get rid of strcpy().
  void tst_QByteArray::qstrcpy()
  {
      const char *src = "Something about ... \0 a string.";
-@@ -778,6 +781,7 @@ void tst_QByteArray::qstrcpy()
+@@ -774,6 +777,7 @@ void tst_QByteArray::qstrcpy()
      QCOMPARE(::qstrcpy(dst ,src), (char *)dst);
      QCOMPARE((char *)dst, const_cast<char *>(expected));
  }

x11/qt5/patches/patch-qtdeclarative_src_3rdparty_masm_wtf_Platform_h

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtdeclarative_src_3rdparty_masm_wtf_Platform_h,v 1.1.1.1 2014/12/08 20:33:41 zhuk Exp $
+$OpenBSD: patch-qtdeclarative_src_3rdparty_masm_wtf_Platform_h,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Use system malloc(3).
---- qtdeclarative/src/3rdparty/masm/wtf/Platform.h.ports.orig	Tue Nov 11 00:27:12 2014
-+++ qtdeclarative/src/3rdparty/masm/wtf/Platform.h	Tue Nov 11 00:28:39 2014
-@@ -669,7 +669,7 @@
+--- qtdeclarative/src/3rdparty/masm/wtf/Platform.h.ports.orig	Tue Feb 17 07:57:29 2015
++++ qtdeclarative/src/3rdparty/masm/wtf/Platform.h	Wed Apr  8 00:38:30 2015
+@@ -670,7 +670,7 @@
  #if PLATFORM(QT)
  /* We must not customize the global operator new and delete for the Qt port. */
  #define ENABLE_GLOBAL_FASTMALLOC_NEW 0

x11/qt5/patches/patch-qtdeclarative_src_qml_jit_qv4assembler_cpp

@@ -1,13 +0,0 @@
-$OpenBSD: patch-qtdeclarative_src_qml_jit_qv4assembler_cpp,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
-Unbreak compilation.
---- qtdeclarative/src/qml/jit/qv4assembler.cpp.ports.orig	Wed Nov  5 00:07:50 2014
-+++ qtdeclarative/src/qml/jit/qv4assembler.cpp	Wed Nov  5 00:12:16 2014
-@@ -96,7 +96,7 @@ QV4::ExecutableAllocator::ChunkOfPages *CompilationUni
- /* Platform/Calling convention/Architecture specific section */
- 
- #if CPU(X86_64)
--#  if OS(LINUX) || OS(MAC_OS_X)
-+#  if OS(LINUX) || OS(MAC_OS_X) || OS(OPENBSD)
- static const Assembler::RegisterID calleeSavedRegisters[] = {
-     JSC::X86Registers::ebx,
-     JSC::X86Registers::r12, // LocalsRegister

x11/qt5/patches/patch-qtdeclarative_src_qml_jsruntime_jsruntime_pri

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtdeclarative_src_qml_jsruntime_jsruntime_pri,v 1.1 2014/12/26 00:02:32 zhuk Exp $
+$OpenBSD: patch-qtdeclarative_src_qml_jsruntime_jsruntime_pri,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Enable W^X in JIT.
---- qtdeclarative/src/qml/jsruntime/jsruntime.pri.ports.orig	Thu Dec 25 23:26:54 2014
-+++ qtdeclarative/src/qml/jsruntime/jsruntime.pri	Thu Dec 25 23:27:08 2014
-@@ -116,6 +116,6 @@ valgrind {
+--- qtdeclarative/src/qml/jsruntime/jsruntime.pri.ports.orig	Tue Feb 17 07:57:27 2015
++++ qtdeclarative/src/qml/jsruntime/jsruntime.pri	Wed Apr  8 00:38:30 2015
+@@ -109,6 +109,6 @@ valgrind {
      DEFINES += V4_USE_VALGRIND
  }
  

x11/qt5/patches/patch-qtdeclarative_src_qml_jsruntime_qv4alloca_p_h

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtdeclarative_src_qml_jsruntime_qv4alloca_p_h,v 1.1 2014/12/10 22:42:17 zhuk Exp $
+$OpenBSD: patch-qtdeclarative_src_qml_jsruntime_qv4alloca_p_h,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Unbreak compilation for C++11 mode (GCC 4.8.6 bug?).
---- qtdeclarative/src/qml/jsruntime/qv4alloca_p.h.ports.orig	Tue Dec  9 20:54:45 2014
-+++ qtdeclarative/src/qml/jsruntime/qv4alloca_p.h	Wed Dec 10 01:12:49 2014
-@@ -49,6 +49,10 @@
+--- qtdeclarative/src/qml/jsruntime/qv4alloca_p.h.ports.orig	Tue Feb 17 07:57:27 2015
++++ qtdeclarative/src/qml/jsruntime/qv4alloca_p.h	Wed Apr  8 00:38:30 2015
+@@ -41,6 +41,10 @@
  #  ifndef __GNUC__
  #    define alloca _alloca
  #  endif

x11/qt5/patches/patch-qtdeclarative_src_qml_jsruntime_qv4engine_cpp

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtdeclarative_src_qml_jsruntime_qv4engine_cpp,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtdeclarative_src_qml_jsruntime_qv4engine_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Add support for OpenBSD.
---- qtdeclarative/src/qml/jsruntime/qv4engine.cpp.ports.orig	Wed Nov  5 00:15:07 2014
-+++ qtdeclarative/src/qml/jsruntime/qv4engine.cpp	Wed Nov  5 01:00:45 2014
-@@ -81,6 +81,9 @@
+--- qtdeclarative/src/qml/jsruntime/qv4engine.cpp.ports.orig	Tue Feb 17 07:57:27 2015
++++ qtdeclarative/src/qml/jsruntime/qv4engine.cpp	Wed Apr  8 00:38:31 2015
+@@ -74,6 +74,9 @@
  #if USE(PTHREADS)
  #  include <pthread.h>
  #  include <sys/resource.h>
@@ -12,7 +12,7 @@ Add support for OpenBSD.
  #if HAVE(PTHREAD_NP_H)
  #  include <pthread_np.h>
  #endif
-@@ -113,6 +116,12 @@ quintptr getStackLimit()
+@@ -108,6 +111,12 @@ quintptr getStackLimit()
      } else
          size = pthread_get_stacksize_np(thread_self);
      stackLimit -= size;

x11/qt5/patches/patch-qtdeclarative_src_qml_jsruntime_qv4stringobject_cpp

@@ -1,9 +1,9 @@
-$OpenBSD: patch-qtdeclarative_src_qml_jsruntime_qv4stringobject_cpp,v 1.1 2014/12/10 22:42:17 zhuk Exp $
+$OpenBSD: patch-qtdeclarative_src_qml_jsruntime_qv4stringobject_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Unbreak compilation for C++11 mode (GCC 4.8.6 bug?).
 Should go upstream probably anyway, though.
---- qtdeclarative/src/qml/jsruntime/qv4stringobject.cpp.ports.orig	Wed Dec 10 01:16:02 2014
-+++ qtdeclarative/src/qml/jsruntime/qv4stringobject.cpp	Wed Dec 10 01:17:03 2014
-@@ -45,6 +45,8 @@
+--- qtdeclarative/src/qml/jsruntime/qv4stringobject.cpp.ports.orig	Tue Feb 17 07:57:27 2015
++++ qtdeclarative/src/qml/jsruntime/qv4stringobject.cpp	Wed Apr  8 00:38:31 2015
+@@ -37,6 +37,8 @@
  #include "qv4objectproto_p.h"
  #include "qv4mm_p.h"
  #include "qv4scopedvalue_p.h"

x11/qt5/patches/patch-qtmacextras_src_src_pro

@@ -0,0 +1,10 @@
+$OpenBSD: patch-qtmacextras_src_src_pro,v 1.1 2015/04/19 13:18:28 zhuk Exp $
+Unbreak build of documentation.
+--- qtmacextras/src/src.pro.ports.orig	Fri Apr 17 00:03:12 2015
++++ qtmacextras/src/src.pro	Fri Apr 17 00:05:29 2015
+@@ -6,4 +6,5 @@ else {
+     # fake project for creating the documentation
+     TEMPLATE = aux
+     QMAKE_DOCS = $$PWD/macextras/doc/qtmacextras.qdocconf
++    tagfile = macextras/doc/qtmacextras.tags
+ }

x11/qt5/patches/patch-qtmultimedia_config_tests_gstreamer_main_cpp

@@ -1,9 +1,9 @@
-$OpenBSD: patch-qtmultimedia_config_tests_gstreamer_main_cpp,v 1.1 2014/12/10 22:40:05 zhuk Exp $
+$OpenBSD: patch-qtmultimedia_config_tests_gstreamer_main_cpp,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Disable detection of GStreamer 0.10, to avoid loading of both GStreamer 0.10 and
 GStreamer 1.0 libraries when linking to both Qt5Multimedia and Qt5Webkit.
---- qtmultimedia/config.tests/gstreamer/main.cpp.ports.orig	Thu Dec 11 01:36:13 2014
-+++ qtmultimedia/config.tests/gstreamer/main.cpp	Thu Dec 11 00:56:42 2014
-@@ -42,6 +42,7 @@
+--- qtmultimedia/config.tests/gstreamer/main.cpp.ports.orig	Tue Feb 17 07:57:20 2015
++++ qtmultimedia/config.tests/gstreamer/main.cpp	Wed Apr  8 00:38:31 2015
+@@ -34,6 +34,7 @@
  #define GST_USE_UNSTABLE_API
  
  #include <gst/gst.h>

x11/qt5/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol_cpp

@@ -1,17 +0,0 @@
-$OpenBSD: patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol_cpp,v 1.1 2014/12/10 21:23:54 zhuk Exp $
-Unbreak compilation.
---- qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp.ports.orig	Wed Dec 10 01:37:35 2014
-+++ qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp	Wed Dec 10 01:38:31 2014
-@@ -47,7 +47,11 @@
- #include <private/qcore_unix_p.h>
- 
- #if defined(USE_V4L)
--#include <linux/videodev2.h>
-+#  if defined(Q_OS_OPENBSD)
-+#    include <sys/videoio.h>
-+#  else
-+#    include <linux/videodev2.h>
-+#  endif
- #endif
- 
- QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl(QObject *parent)

x11/qt5/patches/patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin_cpp

@@ -1,17 +0,0 @@
-$OpenBSD: patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin_cpp,v 1.1 2014/12/10 21:23:54 zhuk Exp $
-Unbreak compilation.
---- qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp.ports.orig	Wed Dec 10 01:44:44 2014
-+++ qtmultimedia/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp	Wed Dec 10 01:45:20 2014
-@@ -53,7 +53,11 @@
- #include <private/qcore_unix_p.h>
- 
- #if defined(USE_V4L)
--#include <linux/videodev2.h>
-+#  if defined(Q_OS_OPENBSD)
-+#    include <sys/videoio.h>
-+#  else
-+#    include <linux/videodev2.h>
-+#  endif
- #endif
- 
- QT_BEGIN_NAMESPACE

x11/qt5/patches/patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_MathExtras_h

@@ -0,0 +1,26 @@
+$OpenBSD: patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_MathExtras_h,v 1.1 2015/04/19 13:18:28 zhuk Exp $
+Unbreak compilation.
+--- qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h.ports.orig	Tue Apr 14 18:46:12 2015
++++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h	Tue Apr 14 18:46:28 2015
+@@ -95,21 +95,6 @@ inline bool isinf(double x) { return !finite(x) && !is
+ 
+ #endif
+ 
+-#if OS(OPENBSD)
+-
+-namespace std {
+-
+-#ifndef isfinite
+-inline bool isfinite(double x) { return finite(x); }
+-#endif
+-#ifndef signbit
+-inline bool signbit(double x) { struct ieee_double *p = (struct ieee_double *)&x; return p->dbl_sign; }
+-#endif
+-
+-} // namespace std
+-
+-#endif
+-
+ #if (COMPILER(MSVC) && _MSC_VER < 1800) || COMPILER(RVCT)
+ 
+ // We must not do 'num + 0.5' or 'num - 0.5' because they can cause precision loss.

x11/qt5/patches/patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v 1.1 2015/01/20 13:38:42 zhuk Exp $
+$OpenBSD: patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Enable W^X in JIT.
---- qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.ports.orig	Wed Jan  7 14:12:26 2015
-+++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	Wed Jan  7 14:13:35 2015
-@@ -1042,7 +1042,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=
+--- qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.ports.orig	Tue Feb 17 07:56:21 2015
++++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	Wed Apr  8 00:38:31 2015
+@@ -1075,7 +1075,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=
  #endif
  /* Setting this flag prevents the assembler from using RWX memory; this may improve
     security but currectly comes at a significant performance cost. */

x11/qt5/patches/patch-qttools_src_assistant_qhelpgenerator_qhelpgenerator_pro

@@ -0,0 +1,16 @@
+$OpenBSD: patch-qttools_src_assistant_qhelpgenerator_qhelpgenerator_pro,v 1.1 2015/04/19 13:18:28 zhuk Exp $
+Make sure qthelpgenerator doesn't pick up system libraries when run
+during documentation build.
+--- qttools/src/assistant/qhelpgenerator/qhelpgenerator.pro.ports.orig	Sat Apr 18 22:56:18 2015
++++ qttools/src/assistant/qhelpgenerator/qhelpgenerator.pro	Sat Apr 18 23:56:41 2015
+@@ -8,3 +8,10 @@ SOURCES += ../shared/helpgenerator.cpp \
+ HEADERS += ../shared/helpgenerator.h
+ 
+ load(qt_tool)
++
++# Make sure plugins are loaded from build directory rather than
++# from system one: qhelpgenerator may be called during normal build.
++QT_CONF_CONTENTS = \
++    "[Paths]" \
++    "Plugins = ../../qtbase/plugins"
++write_file("$$DESTDIR/qt.conf", QT_CONF_CONTENTS)|error("Aborting.")

x11/qt5/patches/patch-qtwebkit_Source_JavaScriptCore_jit_ExecutableAllocator_h

@@ -1,11 +1,11 @@
-$OpenBSD: patch-qtwebkit_Source_JavaScriptCore_jit_ExecutableAllocator_h,v 1.1 2015/01/20 13:38:42 zhuk Exp $
+$OpenBSD: patch-qtwebkit_Source_JavaScriptCore_jit_ExecutableAllocator_h,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Taken from www/webkitgtk4 port, see also:
 https://bugs.webkit.org/show_bug.cgi?id=61137
---- qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h.ports.orig	Tue Jan  6 11:35:36 2015
-+++ qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h	Tue Jan  6 11:37:35 2015
+--- qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h.ports.orig	Tue Feb 17 07:57:12 2015
++++ qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h	Wed Apr  8 00:38:31 2015
 @@ -104,7 +104,8 @@ class DemandExecutableAllocator;
  #if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)
- #if CPU(ARM)
+ #if CPU(ARM) || CPU(MIPS)
  static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
 -#elif CPU(X86_64) && !CPU(X32)
 +#elif CPU(X86_64) && !CPU(X32) && !OS(OPENBSD)

x11/qt5/patches/patch-qtwebkit_Source_WTF_wtf_Platform_h

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtwebkit_Source_WTF_wtf_Platform_h,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtwebkit_Source_WTF_wtf_Platform_h,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Use system malloc(3).
---- qtwebkit/Source/WTF/wtf/Platform.h.ports.orig	Tue Nov 11 00:30:55 2014
-+++ qtwebkit/Source/WTF/wtf/Platform.h	Tue Nov 11 00:32:54 2014
-@@ -714,6 +714,10 @@
+--- qtwebkit/Source/WTF/wtf/Platform.h.ports.orig	Tue Feb 17 07:57:01 2015
++++ qtwebkit/Source/WTF/wtf/Platform.h	Wed Apr  8 00:38:31 2015
+@@ -724,6 +724,10 @@
  #endif
  #endif
  

x11/qt5/patches/patch-qtwebkit_Source_WebCore_Target_pri

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtwebkit_Source_WebCore_Target_pri,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtwebkit_Source_WebCore_Target_pri,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Unbreak compilation.
---- qtwebkit/Source/WebCore/Target.pri.ports.orig	Mon Nov 10 00:45:47 2014
-+++ qtwebkit/Source/WebCore/Target.pri	Mon Nov 10 01:24:43 2014
-@@ -4272,6 +4272,12 @@ win32:!mingw:contains(QMAKE_HOST.arch, x86_64):{
+--- qtwebkit/Source/WebCore/Target.pri.ports.orig	Tue Feb 17 07:57:09 2015
++++ qtwebkit/Source/WebCore/Target.pri	Wed Apr  8 00:38:31 2015
+@@ -4280,6 +4280,12 @@ win32:!mingw:contains(QMAKE_HOST.arch, x86_64):{
     }
  }
  

x11/qt5/patches/patch-qtwebkit_Tools_qmake_config_tests_gccdepends_gccdepends_pro

@@ -1,8 +1,8 @@
-$OpenBSD: patch-qtwebkit_Tools_qmake_config_tests_gccdepends_gccdepends_pro,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtwebkit_Tools_qmake_config_tests_gccdepends_gccdepends_pro,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Unbreak configure stage.
---- qtwebkit/Tools/qmake/config.tests/gccdepends/gccdepends.pro.ports.orig	Fri Nov  7 02:15:40 2014
-+++ qtwebkit/Tools/qmake/config.tests/gccdepends/gccdepends.pro	Fri Nov  7 13:07:15 2014
-@@ -3,25 +3,20 @@
+--- qtwebkit/Tools/qmake/config.tests/gccdepends/gccdepends.pro.ports.orig	Tue Feb 17 07:57:00 2015
++++ qtwebkit/Tools/qmake/config.tests/gccdepends/gccdepends.pro	Wed Apr  8 00:38:31 2015
+@@ -3,25 +3,20 @@ OBJECTS_DIR = obj
  QMAKE_CXXFLAGS += -MD
  
  base_filename = empty

x11/qt5/patches/patch-qtwebkit_Tools_qmake_mkspecs_features_default_pre_prf

@@ -1,7 +1,7 @@
-$OpenBSD: patch-qtwebkit_Tools_qmake_mkspecs_features_default_pre_prf,v 1.1.1.1 2014/12/08 20:33:38 zhuk Exp $
+$OpenBSD: patch-qtwebkit_Tools_qmake_mkspecs_features_default_pre_prf,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 Use gflex instead of flex from base system, or things won't work.
---- qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf.ports.orig	Thu Nov  6 12:54:13 2014
-+++ qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf	Thu Nov  6 12:55:52 2014
+--- qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf.ports.orig	Tue Feb 17 07:57:00 2015
++++ qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf	Wed Apr  8 00:41:38 2015
 @@ -105,7 +105,11 @@ if(win32|mac):!macx-xcode {
  
  # A newer version of flex is required on Windows. At the moment the only
@@ -11,6 +11,6 @@ Use gflex instead of flex from base system, or things won't work.
 +# The flex program from base system won't satisfy our needs.
  FLEX = flex
 +openbsd: FLEX = gflex
- win32: FLEX = win_flex
+ equals(QMAKE_HOST.os, Windows): FLEX = win_flex
  
  BIN_EXTENSION =

x11/qt5/patches/patch-qtwinextras_src_src_pro

@@ -0,0 +1,10 @@
+$OpenBSD: patch-qtwinextras_src_src_pro,v 1.1 2015/04/19 13:18:28 zhuk Exp $
+Unbreak build of documentation.
+--- qtwinextras/src/src.pro.ports.orig	Fri Apr 17 00:04:19 2015
++++ qtwinextras/src/src.pro	Fri Apr 17 00:05:24 2015
+@@ -7,4 +7,5 @@ win32 {
+     # fake project for creating the documentation
+     TEMPLATE = aux
+     QMAKE_DOCS = $$PWD/winextras/doc/qtwinextras.qdocconf
++    tagfile = winextras/doc/qtwinextras.tags
+ }

x11/qt5/pkg/DESCR-html

@@ -1 +1 @@
-This is an off-line copy of the Qt5 documentation
+This is an off-line copy of the Qt5 documentation in HTML format.

x11/qt5/pkg/DESCR-qch

@@ -0,0 +1 @@
+This is an off-line copy of the Qt5 documentation in QCH format.

x11/qt5/pkg/PLIST-examples

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-examples,v 1.1.1.1 2014/12/08 20:33:46 zhuk Exp $
+@comment $OpenBSD: PLIST-examples,v 1.2 2015/04/19 13:18:28 zhuk Exp $
 @lib lib/libfftreal.so.${LIBfftreal_VERSION}
 @lib lib/libgruesensor.so.${LIBgruesensor_VERSION}
 lib/qt5/examples/
@@ -65,6 +65,7 @@ lib/qt5/examples/bluetooth/btchat/remoteselector.cpp
 lib/qt5/examples/bluetooth/btchat/remoteselector.h
 lib/qt5/examples/bluetooth/btchat/remoteselector.ui
 lib/qt5/examples/bluetooth/btfiletransfer/
+@bin lib/qt5/examples/bluetooth/btfiletransfer/btfiletransfer
 lib/qt5/examples/bluetooth/btfiletransfer/btfiletransfer.pro
 lib/qt5/examples/bluetooth/btfiletransfer/btfiletransfer.qrc
 lib/qt5/examples/bluetooth/btfiletransfer/busy.gif
@@ -89,6 +90,62 @@ lib/qt5/examples/bluetooth/btscanner/main.cpp
 lib/qt5/examples/bluetooth/btscanner/service.cpp
 lib/qt5/examples/bluetooth/btscanner/service.h
 lib/qt5/examples/bluetooth/btscanner/service.ui
+lib/qt5/examples/bluetooth/chat/
+lib/qt5/examples/bluetooth/chat/Button.qml
+lib/qt5/examples/bluetooth/chat/InputBox.qml
+lib/qt5/examples/bluetooth/chat/Search.qml
+lib/qt5/examples/bluetooth/chat/chat.pro
+lib/qt5/examples/bluetooth/chat/chat.qml
+lib/qt5/examples/bluetooth/chat/chat.qrc
+lib/qt5/examples/bluetooth/chat/images/
+lib/qt5/examples/bluetooth/chat/images/clear.png
+lib/qt5/examples/bluetooth/chat/images/default.png
+lib/qt5/examples/bluetooth/chat/images/lineedit-bg.png
+lib/qt5/examples/bluetooth/chat/qmlchat.cpp
+lib/qt5/examples/bluetooth/heartlistener/
+lib/qt5/examples/bluetooth/heartlistener/assets/
+lib/qt5/examples/bluetooth/heartlistener/assets/Button.qml
+lib/qt5/examples/bluetooth/heartlistener/assets/Point.qml
+lib/qt5/examples/bluetooth/heartlistener/assets/blue_heart.png
+lib/qt5/examples/bluetooth/heartlistener/assets/blue_heart_small.png
+lib/qt5/examples/bluetooth/heartlistener/assets/busy_dark.png
+lib/qt5/examples/bluetooth/heartlistener/assets/dialog.qml
+lib/qt5/examples/bluetooth/heartlistener/assets/draw.js
+lib/qt5/examples/bluetooth/heartlistener/assets/home.qml
+lib/qt5/examples/bluetooth/heartlistener/assets/main.qml
+lib/qt5/examples/bluetooth/heartlistener/assets/monitor.qml
+lib/qt5/examples/bluetooth/heartlistener/assets/results.qml
+lib/qt5/examples/bluetooth/heartlistener/assets/star.png
+lib/qt5/examples/bluetooth/heartlistener/deviceinfo.cpp
+lib/qt5/examples/bluetooth/heartlistener/deviceinfo.h
+@bin lib/qt5/examples/bluetooth/heartlistener/heartlistener
+lib/qt5/examples/bluetooth/heartlistener/heartlistener.pro
+lib/qt5/examples/bluetooth/heartlistener/heartrate.cpp
+lib/qt5/examples/bluetooth/heartlistener/heartrate.h
+lib/qt5/examples/bluetooth/heartlistener/main.cpp
+lib/qt5/examples/bluetooth/heartlistener/resources.qrc
+lib/qt5/examples/bluetooth/lowenergyscanner/
+lib/qt5/examples/bluetooth/lowenergyscanner/assets/
+lib/qt5/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml
+lib/qt5/examples/bluetooth/lowenergyscanner/assets/Dialog.qml
+lib/qt5/examples/bluetooth/lowenergyscanner/assets/Header.qml
+lib/qt5/examples/bluetooth/lowenergyscanner/assets/Label.qml
+lib/qt5/examples/bluetooth/lowenergyscanner/assets/Menu.qml
+lib/qt5/examples/bluetooth/lowenergyscanner/assets/Services.qml
+lib/qt5/examples/bluetooth/lowenergyscanner/assets/busy_dark.png
+lib/qt5/examples/bluetooth/lowenergyscanner/assets/main.qml
+lib/qt5/examples/bluetooth/lowenergyscanner/characteristicinfo.cpp
+lib/qt5/examples/bluetooth/lowenergyscanner/characteristicinfo.h
+lib/qt5/examples/bluetooth/lowenergyscanner/device.cpp
+lib/qt5/examples/bluetooth/lowenergyscanner/device.h
+lib/qt5/examples/bluetooth/lowenergyscanner/deviceinfo.cpp
+lib/qt5/examples/bluetooth/lowenergyscanner/deviceinfo.h
+@bin lib/qt5/examples/bluetooth/lowenergyscanner/lowenergyscanner
+lib/qt5/examples/bluetooth/lowenergyscanner/lowenergyscanner.pro
+lib/qt5/examples/bluetooth/lowenergyscanner/main.cpp
+lib/qt5/examples/bluetooth/lowenergyscanner/resources.qrc
+lib/qt5/examples/bluetooth/lowenergyscanner/serviceinfo.cpp
+lib/qt5/examples/bluetooth/lowenergyscanner/serviceinfo.h
 lib/qt5/examples/bluetooth/picturetransfer/
 lib/qt5/examples/bluetooth/picturetransfer/Button.qml
 lib/qt5/examples/bluetooth/picturetransfer/DeviceDiscovery.qml
@@ -115,13 +172,93 @@ lib/qt5/examples/bluetooth/pingpong/pingpong.pro
 lib/qt5/examples/bluetooth/pingpong/resource.qrc
 lib/qt5/examples/bluetooth/scanner/
 lib/qt5/examples/bluetooth/scanner/Button.qml
-@bin lib/qt5/examples/bluetooth/scanner/btfiletransfer
 lib/qt5/examples/bluetooth/scanner/default.png
 @bin lib/qt5/examples/bluetooth/scanner/qml_scanner
 lib/qt5/examples/bluetooth/scanner/qmlscanner.cpp
 lib/qt5/examples/bluetooth/scanner/scanner.pro
 lib/qt5/examples/bluetooth/scanner/scanner.qml
 lib/qt5/examples/bluetooth/scanner/scanner.qrc
+lib/qt5/examples/corelib/
+lib/qt5/examples/corelib/corelib.pro
+lib/qt5/examples/corelib/ipc/
+lib/qt5/examples/corelib/ipc/README
+lib/qt5/examples/corelib/ipc/ipc.pro
+lib/qt5/examples/corelib/ipc/localfortuneclient/
+lib/qt5/examples/corelib/ipc/localfortuneclient/client.cpp
+lib/qt5/examples/corelib/ipc/localfortuneclient/client.h
+@bin lib/qt5/examples/corelib/ipc/localfortuneclient/localfortuneclient
+lib/qt5/examples/corelib/ipc/localfortuneclient/localfortuneclient.pro
+lib/qt5/examples/corelib/ipc/localfortuneclient/main.cpp
+lib/qt5/examples/corelib/ipc/localfortuneserver/
+@bin lib/qt5/examples/corelib/ipc/localfortuneserver/localfortuneserver
+lib/qt5/examples/corelib/ipc/localfortuneserver/localfortuneserver.pro
+lib/qt5/examples/corelib/ipc/localfortuneserver/main.cpp
+lib/qt5/examples/corelib/ipc/localfortuneserver/server.cpp
+lib/qt5/examples/corelib/ipc/localfortuneserver/server.h
+lib/qt5/examples/corelib/ipc/sharedmemory/
+lib/qt5/examples/corelib/ipc/sharedmemory/dialog.cpp
+lib/qt5/examples/corelib/ipc/sharedmemory/dialog.h
+lib/qt5/examples/corelib/ipc/sharedmemory/dialog.ui
+lib/qt5/examples/corelib/ipc/sharedmemory/image.png
+lib/qt5/examples/corelib/ipc/sharedmemory/main.cpp
+lib/qt5/examples/corelib/ipc/sharedmemory/qt.png
+@bin lib/qt5/examples/corelib/ipc/sharedmemory/sharedmemory
+lib/qt5/examples/corelib/ipc/sharedmemory/sharedmemory.pro
+lib/qt5/examples/corelib/json/
+lib/qt5/examples/corelib/json/json.pro
+lib/qt5/examples/corelib/json/savegame/
+lib/qt5/examples/corelib/json/savegame/character.cpp
+lib/qt5/examples/corelib/json/savegame/character.h
+lib/qt5/examples/corelib/json/savegame/game.cpp
+lib/qt5/examples/corelib/json/savegame/game.h
+lib/qt5/examples/corelib/json/savegame/level.cpp
+lib/qt5/examples/corelib/json/savegame/level.h
+lib/qt5/examples/corelib/json/savegame/main.cpp
+@bin lib/qt5/examples/corelib/json/savegame/savegame
+lib/qt5/examples/corelib/json/savegame/savegame.pro
+lib/qt5/examples/corelib/threads/
+lib/qt5/examples/corelib/threads/README
+lib/qt5/examples/corelib/threads/mandelbrot/
+lib/qt5/examples/corelib/threads/mandelbrot/main.cpp
+@bin lib/qt5/examples/corelib/threads/mandelbrot/mandelbrot
+lib/qt5/examples/corelib/threads/mandelbrot/mandelbrot.pro
+lib/qt5/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp
+lib/qt5/examples/corelib/threads/mandelbrot/mandelbrotwidget.h
+lib/qt5/examples/corelib/threads/mandelbrot/renderthread.cpp
+lib/qt5/examples/corelib/threads/mandelbrot/renderthread.h
+lib/qt5/examples/corelib/threads/semaphores/
+@bin lib/qt5/examples/corelib/threads/semaphores/semaphores
+lib/qt5/examples/corelib/threads/semaphores/semaphores.cpp
+lib/qt5/examples/corelib/threads/semaphores/semaphores.pro
+lib/qt5/examples/corelib/threads/threads.pro
+lib/qt5/examples/corelib/threads/waitconditions/
+@bin lib/qt5/examples/corelib/threads/waitconditions/waitconditions
+lib/qt5/examples/corelib/threads/waitconditions/waitconditions.cpp
+lib/qt5/examples/corelib/threads/waitconditions/waitconditions.pro
+lib/qt5/examples/corelib/tools/
+lib/qt5/examples/corelib/tools/README
+lib/qt5/examples/corelib/tools/contiguouscache/
+@bin lib/qt5/examples/corelib/tools/contiguouscache/contiguouscache
+lib/qt5/examples/corelib/tools/contiguouscache/contiguouscache.pro
+lib/qt5/examples/corelib/tools/contiguouscache/main.cpp
+lib/qt5/examples/corelib/tools/contiguouscache/randomlistmodel.cpp
+lib/qt5/examples/corelib/tools/contiguouscache/randomlistmodel.h
+lib/qt5/examples/corelib/tools/customcompleter/
+@bin lib/qt5/examples/corelib/tools/customcompleter/customtype
+@bin lib/qt5/examples/corelib/tools/customcompleter/customtypesending
+lib/qt5/examples/corelib/tools/customtype/
+lib/qt5/examples/corelib/tools/customtype/customtype.pro
+lib/qt5/examples/corelib/tools/customtype/main.cpp
+lib/qt5/examples/corelib/tools/customtype/message.cpp
+lib/qt5/examples/corelib/tools/customtype/message.h
+lib/qt5/examples/corelib/tools/customtypesending/
+lib/qt5/examples/corelib/tools/customtypesending/customtypesending.pro
+lib/qt5/examples/corelib/tools/customtypesending/main.cpp
+lib/qt5/examples/corelib/tools/customtypesending/message.cpp
+lib/qt5/examples/corelib/tools/customtypesending/message.h
+lib/qt5/examples/corelib/tools/customtypesending/window.cpp
+lib/qt5/examples/corelib/tools/customtypesending/window.h
+lib/qt5/examples/corelib/tools/tools.pro
 lib/qt5/examples/dbus/
 lib/qt5/examples/dbus/chat/
 @bin lib/qt5/examples/dbus/chat/chat
@@ -1920,42 +2057,6 @@ lib/qt5/examples/help/contextsensitivehelp/wateringconfigdialog.cpp
 lib/qt5/examples/help/contextsensitivehelp/wateringconfigdialog.h
 lib/qt5/examples/help/contextsensitivehelp/wateringconfigdialog.ui
 lib/qt5/examples/help/help.pro
-lib/qt5/examples/ipc/
-lib/qt5/examples/ipc/README
-lib/qt5/examples/ipc/ipc.pro
-lib/qt5/examples/ipc/localfortuneclient/
-lib/qt5/examples/ipc/localfortuneclient/client.cpp
-lib/qt5/examples/ipc/localfortuneclient/client.h
-@bin lib/qt5/examples/ipc/localfortuneclient/localfortuneclient
-lib/qt5/examples/ipc/localfortuneclient/localfortuneclient.pro
-lib/qt5/examples/ipc/localfortuneclient/main.cpp
-lib/qt5/examples/ipc/localfortuneserver/
-@bin lib/qt5/examples/ipc/localfortuneserver/localfortuneserver
-lib/qt5/examples/ipc/localfortuneserver/localfortuneserver.pro
-lib/qt5/examples/ipc/localfortuneserver/main.cpp
-lib/qt5/examples/ipc/localfortuneserver/server.cpp
-lib/qt5/examples/ipc/localfortuneserver/server.h
-lib/qt5/examples/ipc/sharedmemory/
-lib/qt5/examples/ipc/sharedmemory/dialog.cpp
-lib/qt5/examples/ipc/sharedmemory/dialog.h
-lib/qt5/examples/ipc/sharedmemory/dialog.ui
-lib/qt5/examples/ipc/sharedmemory/image.png
-lib/qt5/examples/ipc/sharedmemory/main.cpp
-lib/qt5/examples/ipc/sharedmemory/qt.png
-@bin lib/qt5/examples/ipc/sharedmemory/sharedmemory
-lib/qt5/examples/ipc/sharedmemory/sharedmemory.pro
-lib/qt5/examples/json/
-lib/qt5/examples/json/json.pro
-lib/qt5/examples/json/savegame/
-lib/qt5/examples/json/savegame/character.cpp
-lib/qt5/examples/json/savegame/character.h
-lib/qt5/examples/json/savegame/game.cpp
-lib/qt5/examples/json/savegame/game.h
-lib/qt5/examples/json/savegame/level.cpp
-lib/qt5/examples/json/savegame/level.h
-lib/qt5/examples/json/savegame/main.cpp
-@bin lib/qt5/examples/json/savegame/savegame
-lib/qt5/examples/json/savegame/savegame.pro
 lib/qt5/examples/linguist/
 lib/qt5/examples/linguist/README
 lib/qt5/examples/linguist/arrowpad/
@@ -1980,6 +2081,136 @@ lib/qt5/examples/linguist/trollprint/printpanel.h
 @bin lib/qt5/examples/linguist/trollprint/trollprint
 lib/qt5/examples/linguist/trollprint/trollprint.pro
 lib/qt5/examples/linguist/trollprint/trollprint_pt.ts
+lib/qt5/examples/location/
+lib/qt5/examples/location/common/
+lib/qt5/examples/location/common/common/
+lib/qt5/examples/location/common/common/common.pri
+lib/qt5/examples/location/common/common/common.qrc
+lib/qt5/examples/location/common/common/imports/
+lib/qt5/examples/location/common/common/imports/QtLocation/
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/BusyIndicator.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/Button.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/Checkbox.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/Fader.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/IconButton.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/Menu.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/Optionbutton.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/Slider.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/TextWithLabel.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/TitleBar.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/style/
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/style/ButtonStyle.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/style/HMenuItemStyle.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/dialogs/
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/dialogs/Dialog.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/dialogs/ErrorDialog.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/dialogs/InputDialog.qml
+lib/qt5/examples/location/common/common/imports/QtLocation/examples/qmldir
+lib/qt5/examples/location/common/common/resources/
+lib/qt5/examples/location/common/common/resources/busy.png
+lib/qt5/examples/location/common/common/resources/button.png
+lib/qt5/examples/location/common/common/resources/button_pressed.png
+lib/qt5/examples/location/common/common/resources/catch.png
+lib/qt5/examples/location/common/common/resources/categories.png
+lib/qt5/examples/location/common/common/resources/categories_pressed.png
+lib/qt5/examples/location/common/common/resources/checkbox.png
+lib/qt5/examples/location/common/common/resources/checkbox_selected.png
+lib/qt5/examples/location/common/common/resources/cross.png
+lib/qt5/examples/location/common/common/resources/cross_hovered.png
+lib/qt5/examples/location/common/common/resources/cross_pressed.png
+lib/qt5/examples/location/common/common/resources/hmenuItem.png
+lib/qt5/examples/location/common/common/resources/hmenuItem_pressed.png
+lib/qt5/examples/location/common/common/resources/left.png
+lib/qt5/examples/location/common/common/resources/left_pressed.png
+lib/qt5/examples/location/common/common/resources/marker.png
+lib/qt5/examples/location/common/common/resources/marker_hovered.png
+lib/qt5/examples/location/common/common/resources/marker_selected.png
+lib/qt5/examples/location/common/common/resources/node.png
+lib/qt5/examples/location/common/common/resources/node_selected.png
+lib/qt5/examples/location/common/common/resources/option_button.png
+lib/qt5/examples/location/common/common/resources/option_button_selected.png
+lib/qt5/examples/location/common/common/resources/pencil.png
+lib/qt5/examples/location/common/common/resources/pencil_hovered.png
+lib/qt5/examples/location/common/common/resources/pencil_pressed.png
+lib/qt5/examples/location/common/common/resources/quit.png
+lib/qt5/examples/location/common/common/resources/quit_hovered.png
+lib/qt5/examples/location/common/common/resources/quit_pressed.png
+lib/qt5/examples/location/common/common/resources/right.png
+lib/qt5/examples/location/common/common/resources/right_pressed.png
+lib/qt5/examples/location/common/common/resources/scale.png
+lib/qt5/examples/location/common/common/resources/scale_end.png
+lib/qt5/examples/location/common/common/resources/search.png
+lib/qt5/examples/location/common/common/resources/search_pressed.png
+lib/qt5/examples/location/common/common/resources/star.png
+lib/qt5/examples/location/common/common/resources/titlebar.png
+lib/qt5/examples/location/common/common/resources/titlebar.sci
+lib/qt5/examples/location/common/common/resources/vmenuItem.png
+lib/qt5/examples/location/location.pro
+lib/qt5/examples/location/mapviewer/
+lib/qt5/examples/location/mapviewer/content/
+lib/qt5/examples/location/mapviewer/content/dialogs/
+lib/qt5/examples/location/mapviewer/content/dialogs/Message.qml
+lib/qt5/examples/location/mapviewer/content/dialogs/RouteDialog.qml
+lib/qt5/examples/location/mapviewer/content/map/
+lib/qt5/examples/location/mapviewer/content/map/3dItem.qml
+lib/qt5/examples/location/mapviewer/content/map/CircleItem.qml
+lib/qt5/examples/location/mapviewer/content/map/ImageItem.qml
+lib/qt5/examples/location/mapviewer/content/map/MapComponent.qml
+lib/qt5/examples/location/mapviewer/content/map/Marker.qml
+lib/qt5/examples/location/mapviewer/content/map/MiniMap.qml
+lib/qt5/examples/location/mapviewer/content/map/PolygonItem.qml
+lib/qt5/examples/location/mapviewer/content/map/PolylineItem.qml
+lib/qt5/examples/location/mapviewer/content/map/RectangleItem.qml
+lib/qt5/examples/location/mapviewer/content/map/VideoItem.qml
+lib/qt5/examples/location/mapviewer/demo.ogv
+lib/qt5/examples/location/mapviewer/icon.png
+lib/qt5/examples/location/mapviewer/mapviewer.pro
+lib/qt5/examples/location/mapviewer/mapviewer.qml
+lib/qt5/examples/location/mapviewer/mapviewerwrapper.qrc
+@bin lib/qt5/examples/location/mapviewer/qml_location_mapviewer
+lib/qt5/examples/location/mapviewer/qmlmapviewerwrapper.cpp
+lib/qt5/examples/location/places/
+lib/qt5/examples/location/places/content/
+lib/qt5/examples/location/places/content/places/
+lib/qt5/examples/location/places/content/places/CategoryDelegate.qml
+lib/qt5/examples/location/places/content/places/CategoryDialog.qml
+lib/qt5/examples/location/places/content/places/CategoryView.qml
+lib/qt5/examples/location/places/content/places/EditorialDelegate.qml
+lib/qt5/examples/location/places/content/places/EditorialPage.qml
+lib/qt5/examples/location/places/content/places/Group.qml
+lib/qt5/examples/location/places/content/places/MapComponent.qml
+lib/qt5/examples/location/places/content/places/OptionsDialog.qml
+lib/qt5/examples/location/places/content/places/PlaceDelegate.qml
+lib/qt5/examples/location/places/content/places/PlaceDialog.qml
+lib/qt5/examples/location/places/content/places/PlaceEditorials.qml
+lib/qt5/examples/location/places/content/places/PlaceImages.qml
+lib/qt5/examples/location/places/content/places/PlaceReviews.qml
+lib/qt5/examples/location/places/content/places/PlacesUtils.js
+lib/qt5/examples/location/places/content/places/RatingView.qml
+lib/qt5/examples/location/places/content/places/ReviewDelegate.qml
+lib/qt5/examples/location/places/content/places/ReviewPage.qml
+lib/qt5/examples/location/places/content/places/SearchBox.qml
+lib/qt5/examples/location/places/content/places/SearchResultDelegate.qml
+lib/qt5/examples/location/places/content/places/SearchResultView.qml
+lib/qt5/examples/location/places/places.pro
+lib/qt5/examples/location/places/places.qml
+lib/qt5/examples/location/places/placeswrapper.qrc
+@bin lib/qt5/examples/location/places/qml_location_places
+lib/qt5/examples/location/places/qmlplaceswrapper.cpp
+lib/qt5/examples/location/places_list/
+lib/qt5/examples/location/places_list/main.cpp
+@bin lib/qt5/examples/location/places_list/places_list
+lib/qt5/examples/location/places_list/places_list.pro
+lib/qt5/examples/location/places_list/places_list.qml
+lib/qt5/examples/location/places_map/
+lib/qt5/examples/location/places_map/main.cpp
+lib/qt5/examples/location/places_map/marker.png
+@bin lib/qt5/examples/location/places_map/places_map
+lib/qt5/examples/location/places_map/places_map.pro
+lib/qt5/examples/location/places_map/places_map.qml
 lib/qt5/examples/multimedia/
 lib/qt5/examples/multimedia/audiodecoder/
 @bin lib/qt5/examples/multimedia/audiodecoder/audiodecoder
@@ -2026,11 +2257,14 @@ lib/qt5/examples/multimedia/audiorecorder/qaudiolevel.cpp
 lib/qt5/examples/multimedia/audiorecorder/qaudiolevel.h
 lib/qt5/examples/multimedia/declarative-camera/
 lib/qt5/examples/multimedia/declarative-camera/CameraButton.qml
+lib/qt5/examples/multimedia/declarative-camera/CameraListButton.qml
+lib/qt5/examples/multimedia/declarative-camera/CameraListPopup.qml
 lib/qt5/examples/multimedia/declarative-camera/CameraPropertyButton.qml
 lib/qt5/examples/multimedia/declarative-camera/CameraPropertyPopup.qml
 lib/qt5/examples/multimedia/declarative-camera/FocusButton.qml
 lib/qt5/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
 lib/qt5/examples/multimedia/declarative-camera/PhotoPreview.qml
+lib/qt5/examples/multimedia/declarative-camera/Popup.qml
 lib/qt5/examples/multimedia/declarative-camera/VideoCaptureControls.qml
 lib/qt5/examples/multimedia/declarative-camera/VideoPreview.qml
 lib/qt5/examples/multimedia/declarative-camera/ZoomControl.qml
@@ -2134,13 +2368,8 @@ lib/qt5/examples/multimedia/spectrum/spectrum.pro
 lib/qt5/examples/multimedia/video/
 lib/qt5/examples/multimedia/video/qmlvideo/
 lib/qt5/examples/multimedia/video/qmlvideo/images/
-lib/qt5/examples/multimedia/video/qmlvideo/images/close.png
 lib/qt5/examples/multimedia/video/qmlvideo/images/folder.png
 lib/qt5/examples/multimedia/video/qmlvideo/images/leaves.jpg
-lib/qt5/examples/multimedia/video/qmlvideo/images/progress_handle.svg
-lib/qt5/examples/multimedia/video/qmlvideo/images/progress_handle_pressed.svg
-lib/qt5/examples/multimedia/video/qmlvideo/images/titlebar.png
-lib/qt5/examples/multimedia/video/qmlvideo/images/titlebar.sci
 lib/qt5/examples/multimedia/video/qmlvideo/images/up.png
 lib/qt5/examples/multimedia/video/qmlvideo/main.cpp
 lib/qt5/examples/multimedia/video/qmlvideo/qml/
@@ -2158,7 +2387,6 @@ lib/qt5/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraResize.qml
 lib/qt5/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraRotate.qml
 lib/qt5/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraSpin.qml
 lib/qt5/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml
-lib/qt5/examples/multimedia/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml
 lib/qt5/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml
 lib/qt5/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
 lib/qt5/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml
@@ -2212,11 +2440,9 @@ lib/qt5/examples/multimedia/video/qmlvideofx/qml/
 lib/qt5/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/
 lib/qt5/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Button.qml
 lib/qt5/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml
-lib/qt5/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
 lib/qt5/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml
 lib/qt5/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
 lib/qt5/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Curtain.qml
-lib/qt5/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml
 lib/qt5/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Divider.qml
 lib/qt5/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml
 lib/qt5/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
@@ -2590,32 +2816,18 @@ lib/qt5/examples/opengl/cube/mainwidget.h
 lib/qt5/examples/opengl/cube/shaders.qrc
 lib/qt5/examples/opengl/cube/textures.qrc
 lib/qt5/examples/opengl/cube/vshader.glsl
-lib/qt5/examples/opengl/framebufferobject2/
-lib/qt5/examples/opengl/framebufferobject2/cubelogo.png
-@bin lib/qt5/examples/opengl/framebufferobject2/framebufferobject2
-lib/qt5/examples/opengl/framebufferobject2/framebufferobject2.pro
-lib/qt5/examples/opengl/framebufferobject2/framebufferobject2.qrc
-lib/qt5/examples/opengl/framebufferobject2/glwidget.cpp
-lib/qt5/examples/opengl/framebufferobject2/glwidget.h
-lib/qt5/examples/opengl/framebufferobject2/main.cpp
-lib/qt5/examples/opengl/grabber/
-lib/qt5/examples/opengl/grabber/glwidget.cpp
-lib/qt5/examples/opengl/grabber/glwidget.h
-@bin lib/qt5/examples/opengl/grabber/grabber
-lib/qt5/examples/opengl/grabber/grabber.pro
-lib/qt5/examples/opengl/grabber/main.cpp
-lib/qt5/examples/opengl/grabber/mainwindow.cpp
-lib/qt5/examples/opengl/grabber/mainwindow.h
-lib/qt5/examples/opengl/hellogl/
-lib/qt5/examples/opengl/hellogl/glwidget.cpp
-lib/qt5/examples/opengl/hellogl/glwidget.h
-@bin lib/qt5/examples/opengl/hellogl/hellogl
-lib/qt5/examples/opengl/hellogl/hellogl.pro
-lib/qt5/examples/opengl/hellogl/main.cpp
-lib/qt5/examples/opengl/hellogl/qtlogo.cpp
-lib/qt5/examples/opengl/hellogl/qtlogo.h
-lib/qt5/examples/opengl/hellogl/window.cpp
-lib/qt5/examples/opengl/hellogl/window.h
+lib/qt5/examples/opengl/hellogl2/
+lib/qt5/examples/opengl/hellogl2/glwidget.cpp
+lib/qt5/examples/opengl/hellogl2/glwidget.h
+@bin lib/qt5/examples/opengl/hellogl2/hellogl2
+lib/qt5/examples/opengl/hellogl2/hellogl2.pro
+lib/qt5/examples/opengl/hellogl2/logo.cpp
+lib/qt5/examples/opengl/hellogl2/logo.h
+lib/qt5/examples/opengl/hellogl2/main.cpp
+lib/qt5/examples/opengl/hellogl2/mainwindow.cpp
+lib/qt5/examples/opengl/hellogl2/mainwindow.h
+lib/qt5/examples/opengl/hellogl2/window.cpp
+lib/qt5/examples/opengl/hellogl2/window.h
 lib/qt5/examples/opengl/hellowindow/
 @bin lib/qt5/examples/opengl/hellowindow/hellowindow
 lib/qt5/examples/opengl/hellowindow/hellowindow.cpp
@@ -2623,41 +2835,32 @@ lib/qt5/examples/opengl/hellowindow/hellowindow.h
 lib/qt5/examples/opengl/hellowindow/hellowindow.pro
 lib/qt5/examples/opengl/hellowindow/main.cpp
 lib/qt5/examples/opengl/opengl.pro
-lib/qt5/examples/opengl/overpainting/
-lib/qt5/examples/opengl/overpainting/bubble.cpp
-lib/qt5/examples/opengl/overpainting/bubble.h
-lib/qt5/examples/opengl/overpainting/glwidget.cpp
-lib/qt5/examples/opengl/overpainting/glwidget.h
-lib/qt5/examples/opengl/overpainting/main.cpp
-@bin lib/qt5/examples/opengl/overpainting/overpainting
-lib/qt5/examples/opengl/overpainting/overpainting.pro
-lib/qt5/examples/opengl/overpainting/qtlogo.cpp
-lib/qt5/examples/opengl/overpainting/qtlogo.h
 lib/qt5/examples/opengl/paintedwindow/
 lib/qt5/examples/opengl/paintedwindow/main.cpp
 @bin lib/qt5/examples/opengl/paintedwindow/paintedwindow
 lib/qt5/examples/opengl/paintedwindow/paintedwindow.cpp
 lib/qt5/examples/opengl/paintedwindow/paintedwindow.h
 lib/qt5/examples/opengl/paintedwindow/paintedwindow.pro
-lib/qt5/examples/opengl/pbuffers/
-lib/qt5/examples/opengl/pbuffers/cube.cpp
-lib/qt5/examples/opengl/pbuffers/cube.h
-lib/qt5/examples/opengl/pbuffers/cubelogo.png
-lib/qt5/examples/opengl/pbuffers/glwidget.cpp
-lib/qt5/examples/opengl/pbuffers/glwidget.h
-lib/qt5/examples/opengl/pbuffers/main.cpp
-@bin lib/qt5/examples/opengl/pbuffers/pbuffers
-lib/qt5/examples/opengl/pbuffers/pbuffers.pro
-lib/qt5/examples/opengl/pbuffers/pbuffers.qrc
-lib/qt5/examples/opengl/samplebuffers/
-lib/qt5/examples/opengl/samplebuffers/glwidget.cpp
-lib/qt5/examples/opengl/samplebuffers/glwidget.h
-lib/qt5/examples/opengl/samplebuffers/main.cpp
-@bin lib/qt5/examples/opengl/samplebuffers/samplebuffers
-lib/qt5/examples/opengl/samplebuffers/samplebuffers.pro
-lib/qt5/examples/opengl/shared/
-lib/qt5/examples/opengl/shared/qtlogo.cpp
-lib/qt5/examples/opengl/shared/qtlogo.h
+lib/qt5/examples/opengl/qopenglwidget/
+lib/qt5/examples/opengl/qopenglwidget/bubble.cpp
+lib/qt5/examples/opengl/qopenglwidget/bubble.h
+lib/qt5/examples/opengl/qopenglwidget/glwidget.cpp
+lib/qt5/examples/opengl/qopenglwidget/glwidget.h
+lib/qt5/examples/opengl/qopenglwidget/main.cpp
+lib/qt5/examples/opengl/qopenglwidget/mainwindow.cpp
+lib/qt5/examples/opengl/qopenglwidget/mainwindow.h
+@bin lib/qt5/examples/opengl/qopenglwidget/qopenglwidget
+lib/qt5/examples/opengl/qopenglwidget/qopenglwidget.pro
+lib/qt5/examples/opengl/qopenglwidget/qt.png
+lib/qt5/examples/opengl/qopenglwidget/texture.qrc
+lib/qt5/examples/opengl/qopenglwindow/
+lib/qt5/examples/opengl/qopenglwindow/background.frag
+lib/qt5/examples/opengl/qopenglwindow/background_renderer.cpp
+lib/qt5/examples/opengl/qopenglwindow/background_renderer.h
+lib/qt5/examples/opengl/qopenglwindow/main.cpp
+@bin lib/qt5/examples/opengl/qopenglwindow/qopenglwindow
+lib/qt5/examples/opengl/qopenglwindow/qopenglwindow.pro
+lib/qt5/examples/opengl/qopenglwindow/shaders.qrc
 lib/qt5/examples/opengl/textures/
 lib/qt5/examples/opengl/textures/glwidget.cpp
 lib/qt5/examples/opengl/textures/glwidget.h
@@ -2674,6 +2877,14 @@ lib/qt5/examples/opengl/textures/textures.pro
 lib/qt5/examples/opengl/textures/textures.qrc
 lib/qt5/examples/opengl/textures/window.cpp
 lib/qt5/examples/opengl/textures/window.h
+lib/qt5/examples/opengl/threadedqopenglwidget/
+lib/qt5/examples/opengl/threadedqopenglwidget/glwidget.cpp
+lib/qt5/examples/opengl/threadedqopenglwidget/glwidget.h
+lib/qt5/examples/opengl/threadedqopenglwidget/main.cpp
+lib/qt5/examples/opengl/threadedqopenglwidget/mainwindow.cpp
+lib/qt5/examples/opengl/threadedqopenglwidget/mainwindow.h
+@bin lib/qt5/examples/opengl/threadedqopenglwidget/threadedqopenglwidget
+lib/qt5/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro
 lib/qt5/examples/positioning/
 lib/qt5/examples/positioning/flickr/
 lib/qt5/examples/positioning/flickr/flickr-90.qml
@@ -2713,6 +2924,7 @@ lib/qt5/examples/positioning/flickr/qmllocationflickr.cpp
 lib/qt5/examples/positioning/logfilepositionsource/
 lib/qt5/examples/positioning/logfilepositionsource/clientapplication.cpp
 lib/qt5/examples/positioning/logfilepositionsource/clientapplication.h
+lib/qt5/examples/positioning/logfilepositionsource/logfile.qrc
 @bin lib/qt5/examples/positioning/logfilepositionsource/logfilepositionsource
 lib/qt5/examples/positioning/logfilepositionsource/logfilepositionsource.cpp
 lib/qt5/examples/positioning/logfilepositionsource/logfilepositionsource.h
@@ -2949,6 +3161,10 @@ lib/qt5/examples/qmltest/qmltest/tst_qmltest.cpp
 @bin lib/qt5/examples/qmltest/qmltest/tst_qmltestexample
 lib/qt5/examples/qpa/
 lib/qt5/examples/qpa/qpa.pro
+lib/qt5/examples/qpa/qrasterwindow/
+lib/qt5/examples/qpa/qrasterwindow/main.cpp
+@bin lib/qt5/examples/qpa/qrasterwindow/qrasterwindow
+lib/qt5/examples/qpa/qrasterwindow/qrasterwindow.pro
 lib/qt5/examples/qpa/windows/
 lib/qt5/examples/qpa/windows/main.cpp
 lib/qt5/examples/qpa/windows/window.cpp
@@ -3077,13 +3293,16 @@ lib/qt5/examples/quick/customitems/dialcontrol/content/needle.png
 lib/qt5/examples/quick/customitems/dialcontrol/content/needle_shadow.png
 lib/qt5/examples/quick/customitems/dialcontrol/content/overlay.png
 lib/qt5/examples/quick/customitems/dialcontrol/content/quit.png
+lib/qt5/examples/quick/customitems/dialcontrol/dialcontrol.pro
 lib/qt5/examples/quick/customitems/dialcontrol/dialcontrol.qml
 lib/qt5/examples/quick/customitems/dialcontrol/dialcontrol.qmlproject
+lib/qt5/examples/quick/customitems/dialcontrol/dialcontrol.qrc
 lib/qt5/examples/quick/customitems/dialcontrol/doc/
 lib/qt5/examples/quick/customitems/dialcontrol/doc/images/
 lib/qt5/examples/quick/customitems/dialcontrol/doc/images/qml-dialcontrol-example.png
 lib/qt5/examples/quick/customitems/dialcontrol/doc/src/
 lib/qt5/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc
+lib/qt5/examples/quick/customitems/dialcontrol/main.cpp
 lib/qt5/examples/quick/customitems/flipable/
 lib/qt5/examples/quick/customitems/flipable/content/
 lib/qt5/examples/quick/customitems/flipable/content/5_heart.png
@@ -3765,6 +3984,14 @@ lib/qt5/examples/quick/quickwidgets/quickwidget/quickwidget.pro
 lib/qt5/examples/quick/quickwidgets/quickwidget/quickwidget.qrc
 lib/qt5/examples/quick/quickwidgets/quickwidget/rotatingsquare.qml
 lib/qt5/examples/quick/quickwidgets/quickwidgets.pro
+lib/qt5/examples/quick/rendercontrol/
+lib/qt5/examples/quick/rendercontrol/demo.qml
+lib/qt5/examples/quick/rendercontrol/main.cpp
+@bin lib/qt5/examples/quick/rendercontrol/rendercontrol
+lib/qt5/examples/quick/rendercontrol/rendercontrol.pro
+lib/qt5/examples/quick/rendercontrol/rendercontrol.qrc
+lib/qt5/examples/quick/rendercontrol/window.cpp
+lib/qt5/examples/quick/rendercontrol/window.h
 lib/qt5/examples/quick/righttoleft/
 lib/qt5/examples/quick/righttoleft/layoutdirection/
 lib/qt5/examples/quick/righttoleft/layoutdirection/layoutdirection.qml
@@ -3799,6 +4026,14 @@ lib/qt5/examples/quick/scenegraph/openglunderqml/openglunderqml.qrc
 lib/qt5/examples/quick/scenegraph/openglunderqml/squircle.cpp
 lib/qt5/examples/quick/scenegraph/openglunderqml/squircle.h
 lib/qt5/examples/quick/scenegraph/scenegraph.pro
+lib/qt5/examples/quick/scenegraph/sgengine/
+lib/qt5/examples/quick/scenegraph/sgengine/face-smile.png
+lib/qt5/examples/quick/scenegraph/sgengine/main.cpp
+@bin lib/qt5/examples/quick/scenegraph/sgengine/sgengine
+lib/qt5/examples/quick/scenegraph/sgengine/sgengine.pro
+lib/qt5/examples/quick/scenegraph/sgengine/sgengine.qrc
+lib/qt5/examples/quick/scenegraph/sgengine/window.cpp
+lib/qt5/examples/quick/scenegraph/sgengine/window.h
 lib/qt5/examples/quick/scenegraph/simplematerial/
 lib/qt5/examples/quick/scenegraph/simplematerial/main.qml
 @bin lib/qt5/examples/quick/scenegraph/simplematerial/simplematerial
@@ -3831,6 +4066,14 @@ lib/qt5/examples/quick/scenegraph/threadedanimation/spinner.png
 @bin lib/qt5/examples/quick/scenegraph/threadedanimation/threadedanimation
 lib/qt5/examples/quick/scenegraph/threadedanimation/threadedanimation.pro
 lib/qt5/examples/quick/scenegraph/threadedanimation/threadedanimation.qrc
+lib/qt5/examples/quick/scenegraph/twotextureproviders/
+lib/qt5/examples/quick/scenegraph/twotextureproviders/main.cpp
+lib/qt5/examples/quick/scenegraph/twotextureproviders/main.qml
+@bin lib/qt5/examples/quick/scenegraph/twotextureproviders/twotextureproviders
+lib/qt5/examples/quick/scenegraph/twotextureproviders/twotextureproviders.pro
+lib/qt5/examples/quick/scenegraph/twotextureproviders/twotextureproviders.qrc
+lib/qt5/examples/quick/scenegraph/twotextureproviders/xorblender.cpp
+lib/qt5/examples/quick/scenegraph/twotextureproviders/xorblender.h
 lib/qt5/examples/quick/shadereffects/
 lib/qt5/examples/quick/shadereffects/content/
 lib/qt5/examples/quick/shadereffects/content/Slider.qml
@@ -4134,6 +4377,20 @@ lib/qt5/examples/quick/window/main.cpp
 lib/qt5/examples/quick/window/window.pro
 lib/qt5/examples/quick/window/window.qml
 lib/qt5/examples/quick/window/window.qrc
+lib/qt5/examples/qwebchannel/
+lib/qt5/examples/qwebchannel/chatclient-html/
+lib/qt5/examples/qwebchannel/chatclient-html/chatclient.html
+lib/qt5/examples/qwebchannel/chatclient-html/qwebchannel.js
+lib/qt5/examples/qwebchannel/chatclient-qml/
+lib/qt5/examples/qwebchannel/chatclient-qml/qmlchatclient.qml
+lib/qt5/examples/qwebchannel/chatclient-qml/qwebchannel.js
+lib/qt5/examples/qwebchannel/nodejs/
+lib/qt5/examples/qwebchannel/nodejs/chatclient.js
+lib/qt5/examples/qwebchannel/nodejs/package.json
+lib/qt5/examples/qwebchannel/nodejs/qwebchannel.js
+lib/qt5/examples/qwebchannel/standalone/
+lib/qt5/examples/qwebchannel/standalone/index.html
+lib/qt5/examples/qwebchannel/standalone/qwebchannel.js
 lib/qt5/examples/script/
 lib/qt5/examples/script/README
 lib/qt5/examples/script/calculator/
@@ -4244,6 +4501,8 @@ lib/qt5/examples/sensors/grue/libgruesensor.prl
 @lib lib/qt5/examples/sensors/grue/libgruesensor.so.${LIBgruesensor_VERSION}
 lib/qt5/examples/sensors/grue/sensors/
 lib/qt5/examples/sensors/grue/sensors/libqtsensors_grue.so
+lib/qt5/examples/sensors/maze/
+@bin lib/qt5/examples/sensors/maze/maze
 lib/qt5/examples/sensors/qmlqtsensors/
 @bin lib/qt5/examples/sensors/qmlqtsensors/qmlqtsensors
 lib/qt5/examples/sensors/qmlsensorgestures/
@@ -4389,6 +4648,7 @@ lib/qt5/examples/svg/embedded/fluidlauncher/demoapplication.h
 lib/qt5/examples/svg/embedded/fluidlauncher/fluidlauncher.cpp
 lib/qt5/examples/svg/embedded/fluidlauncher/fluidlauncher.h
 lib/qt5/examples/svg/embedded/fluidlauncher/fluidlauncher.pro
+lib/qt5/examples/svg/embedded/fluidlauncher/fluidlauncher.qrc
 lib/qt5/examples/svg/embedded/fluidlauncher/main.cpp
 lib/qt5/examples/svg/embedded/fluidlauncher/pictureflow.cpp
 lib/qt5/examples/svg/embedded/fluidlauncher/pictureflow.h
@@ -4532,49 +4792,6 @@ lib/qt5/examples/svg/svgviewer/svgview.h
 @bin lib/qt5/examples/svg/svgviewer/svgviewer
 lib/qt5/examples/svg/svgviewer/svgviewer.pro
 lib/qt5/examples/svg/svgviewer/svgviewer.qrc
-lib/qt5/examples/threads/
-lib/qt5/examples/threads/README
-lib/qt5/examples/threads/mandelbrot/
-lib/qt5/examples/threads/mandelbrot/main.cpp
-@bin lib/qt5/examples/threads/mandelbrot/mandelbrot
-lib/qt5/examples/threads/mandelbrot/mandelbrot.pro
-lib/qt5/examples/threads/mandelbrot/mandelbrotwidget.cpp
-lib/qt5/examples/threads/mandelbrot/mandelbrotwidget.h
-lib/qt5/examples/threads/mandelbrot/renderthread.cpp
-lib/qt5/examples/threads/mandelbrot/renderthread.h
-lib/qt5/examples/threads/semaphores/
-@bin lib/qt5/examples/threads/semaphores/semaphores
-lib/qt5/examples/threads/semaphores/semaphores.cpp
-lib/qt5/examples/threads/semaphores/semaphores.pro
-lib/qt5/examples/threads/threads.pro
-lib/qt5/examples/threads/waitconditions/
-@bin lib/qt5/examples/threads/waitconditions/waitconditions
-lib/qt5/examples/threads/waitconditions/waitconditions.cpp
-lib/qt5/examples/threads/waitconditions/waitconditions.pro
-lib/qt5/examples/tools/
-lib/qt5/examples/tools/README
-lib/qt5/examples/tools/contiguouscache/
-@bin lib/qt5/examples/tools/contiguouscache/contiguouscache
-lib/qt5/examples/tools/contiguouscache/contiguouscache.pro
-lib/qt5/examples/tools/contiguouscache/main.cpp
-lib/qt5/examples/tools/contiguouscache/randomlistmodel.cpp
-lib/qt5/examples/tools/contiguouscache/randomlistmodel.h
-lib/qt5/examples/tools/customcompleter/
-@bin lib/qt5/examples/tools/customcompleter/customtype
-@bin lib/qt5/examples/tools/customcompleter/customtypesending
-lib/qt5/examples/tools/customtype/
-lib/qt5/examples/tools/customtype/customtype.pro
-lib/qt5/examples/tools/customtype/main.cpp
-lib/qt5/examples/tools/customtype/message.cpp
-lib/qt5/examples/tools/customtype/message.h
-lib/qt5/examples/tools/customtypesending/
-lib/qt5/examples/tools/customtypesending/customtypesending.pro
-lib/qt5/examples/tools/customtypesending/main.cpp
-lib/qt5/examples/tools/customtypesending/message.cpp
-lib/qt5/examples/tools/customtypesending/message.h
-lib/qt5/examples/tools/customtypesending/window.cpp
-lib/qt5/examples/tools/customtypesending/window.h
-lib/qt5/examples/tools/tools.pro
 lib/qt5/examples/touch/
 lib/qt5/examples/touch/dials/
 @bin lib/qt5/examples/touch/dials/dials
@@ -4626,6 +4843,25 @@ lib/qt5/examples/uitools/textfinder/textfinder.h
 lib/qt5/examples/uitools/textfinder/textfinder.pro
 lib/qt5/examples/uitools/textfinder/textfinder.qrc
 lib/qt5/examples/uitools/uitools.pro
+lib/qt5/examples/webchannel/
+lib/qt5/examples/webchannel/chatclient-html/
+lib/qt5/examples/webchannel/chatclient-html/chatclient-html.pro
+lib/qt5/examples/webchannel/chatclient-qml/
+lib/qt5/examples/webchannel/chatclient-qml/chatclient-qml.pro
+lib/qt5/examples/webchannel/chatserver-cpp/
+lib/qt5/examples/webchannel/chatserver-cpp/chatserver-cpp.pro
+lib/qt5/examples/webchannel/chatserver-cpp/chatserver.cpp
+lib/qt5/examples/webchannel/chatserver-cpp/chatserver.h
+lib/qt5/examples/webchannel/chatserver-cpp/main.cpp
+lib/qt5/examples/webchannel/exampleassets.pri
+lib/qt5/examples/webchannel/nodejs/
+lib/qt5/examples/webchannel/nodejs/README
+lib/qt5/examples/webchannel/nodejs/nodejs.pro
+lib/qt5/examples/webchannel/standalone/
+lib/qt5/examples/webchannel/standalone/dialog.ui
+lib/qt5/examples/webchannel/standalone/main.cpp
+lib/qt5/examples/webchannel/standalone/standalone.pro
+lib/qt5/examples/webchannel/webchannel.pro
 lib/qt5/examples/webkitqml/
 lib/qt5/examples/webkitqml/flickrview/
 @bin lib/qt5/examples/webkitqml/flickrview/flickrview
@@ -4879,6 +5115,13 @@ lib/qt5/examples/websockets/qmlwebsocketclient/qml/
 lib/qt5/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/
 lib/qt5/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
 lib/qt5/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
+lib/qt5/examples/websockets/qmlwebsocketserver/
+lib/qt5/examples/websockets/qmlwebsocketserver/data.qrc
+lib/qt5/examples/websockets/qmlwebsocketserver/main.cpp
+lib/qt5/examples/websockets/qmlwebsocketserver/qml/
+lib/qt5/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/
+lib/qt5/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml
+lib/qt5/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro
 lib/qt5/examples/websockets/simplechat/
 lib/qt5/examples/websockets/simplechat/chatserver.cpp
 lib/qt5/examples/websockets/simplechat/chatserver.h
@@ -5624,6 +5867,11 @@ lib/qt5/examples/widgets/itemviews/stardelegate/stareditor.cpp
 lib/qt5/examples/widgets/itemviews/stardelegate/stareditor.h
 lib/qt5/examples/widgets/itemviews/stardelegate/starrating.cpp
 lib/qt5/examples/widgets/itemviews/stardelegate/starrating.h
+lib/qt5/examples/widgets/itemviews/storageview/
+lib/qt5/examples/widgets/itemviews/storageview/main.cpp
+lib/qt5/examples/widgets/itemviews/storageview/storagemodel.cpp
+lib/qt5/examples/widgets/itemviews/storageview/storagemodel.h
+lib/qt5/examples/widgets/itemviews/storageview/storageview.pro
 lib/qt5/examples/widgets/layouts/
 lib/qt5/examples/widgets/layouts/README
 lib/qt5/examples/widgets/layouts/basiclayouts/
@@ -6455,10 +6703,10 @@ lib/qt5/examples/widgets/widgets/lineedits/main.cpp
 lib/qt5/examples/widgets/widgets/lineedits/window.cpp
 lib/qt5/examples/widgets/widgets/lineedits/window.h
 lib/qt5/examples/widgets/widgets/mousebuttons/
-@bin lib/qt5/examples/widgets/widgets/mousebuttons/buttontester
 lib/qt5/examples/widgets/widgets/mousebuttons/buttontester.cpp
 lib/qt5/examples/widgets/widgets/mousebuttons/buttontester.h
 lib/qt5/examples/widgets/widgets/mousebuttons/main.cpp
+@bin lib/qt5/examples/widgets/widgets/mousebuttons/mousebuttons
 lib/qt5/examples/widgets/widgets/mousebuttons/mousebuttons.pro
 lib/qt5/examples/widgets/widgets/movie/
 lib/qt5/examples/widgets/widgets/movie/animation.gif

x11/qt5/pkg/PLIST-qch

@@ -0,0 +1,53 @@
+@comment $OpenBSD: PLIST-qch,v 1.1 2015/04/19 13:18:29 zhuk Exp $
+share/doc/qt5/
+share/doc/qt5/activeqt.qch
+share/doc/qt5/qdoc.qch
+share/doc/qt5/qmake.qch
+share/doc/qt5/qtandroidextras.qch
+share/doc/qt5/qtassistant.qch
+share/doc/qt5/qtbluetooth.qch
+share/doc/qt5/qtconcurrent.qch
+share/doc/qt5/qtcore.qch
+share/doc/qt5/qtdbus.qch
+share/doc/qt5/qtdesigner.qch
+share/doc/qt5/qtdoc.qch
+share/doc/qt5/qtenginio.qch
+share/doc/qt5/qtenginiooverview.qch
+share/doc/qt5/qtenginioqml.qch
+share/doc/qt5/qtgraphicaleffects.qch
+share/doc/qt5/qtgui.qch
+share/doc/qt5/qthelp.qch
+share/doc/qt5/qtimageformats.qch
+share/doc/qt5/qtlinguist.qch
+share/doc/qt5/qtlocation.qch
+share/doc/qt5/qtmacextras.qch
+share/doc/qt5/qtmultimedia.qch
+share/doc/qt5/qtmultimediawidgets.qch
+share/doc/qt5/qtnetwork.qch
+share/doc/qt5/qtnfc.qch
+share/doc/qt5/qtopengl.qch
+share/doc/qt5/qtplatformheaders.qch
+share/doc/qt5/qtpositioning.qch
+share/doc/qt5/qtprintsupport.qch
+share/doc/qt5/qtqml.qch
+share/doc/qt5/qtquick.qch
+share/doc/qt5/qtquickcontrols.qch
+share/doc/qt5/qtquickdialogs.qch
+share/doc/qt5/qtquicklayouts.qch
+share/doc/qt5/qtscript.qch
+share/doc/qt5/qtscripttools.qch
+share/doc/qt5/qtsensors.qch
+share/doc/qt5/qtserialport.qch
+share/doc/qt5/qtsql.qch
+share/doc/qt5/qtsvg.qch
+share/doc/qt5/qttestlib.qch
+share/doc/qt5/qtuitools.qch
+share/doc/qt5/qtwebchannel.qch
+share/doc/qt5/qtwebkit.qch
+share/doc/qt5/qtwebkitexamples.qch
+share/doc/qt5/qtwebsockets.qch
+share/doc/qt5/qtwidgets.qch
+share/doc/qt5/qtwinextras.qch
+share/doc/qt5/qtx11extras.qch
+share/doc/qt5/qtxml.qch
+share/doc/qt5/qtxmlpatterns.qch