diff --git a/srcpkgs/qt5-examples b/srcpkgs/qt5-examples
deleted file mode 120000
index 75793eb6664..00000000000
--- a/srcpkgs/qt5-examples
+++ /dev/null
@@ -1 +0,0 @@
-qt5
\ No newline at end of file
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1e405203800..235b17a5fb6 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.4.2
-revision=1
+revision=2
 wrksrc="qt-everywhere-opensource-src-${version}"
 homepage="http://qt.io/"
 short_desc="A cross-platform application and UI framework (QT5)"
@@ -58,7 +58,7 @@ do_configure() {
 		-translationdir /usr/share/qt5/translations \
 		-examplesdir /usr/share/qt5/examples \
 		-archdatadir /usr/lib/qt5 \
-		-no-compile-examples -accessibility -fontconfig -icu -openssl-linked \
+		-nomake examples -accessibility -fontconfig -icu -openssl-linked \
 		-dbus-linked -no-pch -no-strip -silent -optimized-qmake \
 		-system-libjpeg -system-libpng -system-sqlite -system-zlib \
 		-system-harfbuzz"
@@ -88,19 +88,6 @@ do_install() {
 	done
 }
 
-# Move examples from $PKGDESTDIR to $DESTDIR
-# Subdirectories may already exist, thus copy recursively and remove source
-collect_examples() {
-	local src=$1/usr/share/qt5/examples
-	local dst=$2/usr/share/qt5/examples
-	if [ -d $src ]; then
-		mkdir -p $dst
-		cp -pR $src/* $dst
-		rm -r $src
-		rmdir -p --ignore-fail-on-non-empty $1/usr/share/qt5
-	fi
-}
-
 qt5-connectivity-devel_package() {
 	short_desc+=" - Connectivity component (development)"
 	depends="qt5-connectivity-${version}_${revision} qt5-devel-${version}_${revision}"
@@ -109,7 +96,6 @@ qt5-connectivity-devel_package() {
 		make INSTALL_ROOT=${PKGDESTDIR} install
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/qml
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-connectivity_package() {
@@ -124,7 +110,6 @@ qt5-connectivity_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-declarative-devel_package() {
@@ -137,7 +122,6 @@ qt5-declarative-devel_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/qml
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-declarative_package() {
@@ -156,7 +140,6 @@ qt5-declarative_package() {
 		for f in ${PKGDESTDIR}/usr/lib/qt5/bin/*; do
 			ln -s /usr/lib/qt5/bin/$(basename $f) ${PKGDESTDIR}/usr/bin/$(basename $f)-qt5
 		done
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-doc_package() {
@@ -198,7 +181,6 @@ qt5-doc_package() {
 		for m in $(find . -iname "Makefile*.orig" -type f); do
 			mv $m ${m%.orig}
 		done
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-enginio-devel_package() {
@@ -209,7 +191,6 @@ qt5-enginio-devel_package() {
 		make INSTALL_ROOT=${PKGDESTDIR} install
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/qml
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-enginio_package() {
@@ -223,15 +204,6 @@ qt5-enginio_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
-	}
-}
-qt5-examples_package() {
-	noarch=yes
-	short_desc+=" - Examples"
-	depends="qt5-${version}_${revision}"
-	pkg_install() {
-		vmove usr/share/qt5/examples
 	}
 }
 qt5-graphicaleffects_package() {
@@ -239,7 +211,6 @@ qt5-graphicaleffects_package() {
 	pkg_install() {
 		cd ${wrksrc}/qtgraphicaleffects
 		make INSTALL_ROOT=${PKGDESTDIR} install
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-imageformats_package() {
@@ -247,7 +218,6 @@ qt5-imageformats_package() {
 	pkg_install() {
 		cd ${wrksrc}/qtimageformats
 		make INSTALL_ROOT=${PKGDESTDIR} install
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-location-devel_package() {
@@ -259,7 +229,6 @@ qt5-location-devel_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/qml
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-location_package() {
@@ -273,7 +242,6 @@ qt5-location_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-multimedia-devel_package() {
@@ -285,7 +253,6 @@ qt5-multimedia-devel_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/qml
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-multimedia_package() {
@@ -299,7 +266,6 @@ qt5-multimedia_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-quick1-devel_package() {
@@ -314,7 +280,6 @@ qt5-quick1-devel_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/imports
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-quick1_package() {
@@ -332,7 +297,6 @@ qt5-quick1_package() {
 		for f in ${PKGDESTDIR}/usr/lib/qt5/bin/*; do
 			ln -s /usr/lib/qt5/bin/$(basename $f) ${PKGDESTDIR}/usr/bin/$(basename $f)-qt5
 		done
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-quickcontrols_package() {
@@ -340,7 +304,6 @@ qt5-quickcontrols_package() {
 	pkg_install() {
 		cd ${wrksrc}/qtquickcontrols
 		make INSTALL_ROOT=${PKGDESTDIR} install
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-script-devel_package() {
@@ -350,7 +313,6 @@ qt5-script-devel_package() {
 		cd ${wrksrc}/qtscript
 		make INSTALL_ROOT=${PKGDESTDIR} install
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-script_package() {
@@ -364,7 +326,6 @@ qt5-script_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-sensors-devel_package() {
@@ -376,7 +337,6 @@ qt5-sensors-devel_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/qml
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-sensors_package() {
@@ -390,7 +350,6 @@ qt5-sensors_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-serialport-devel_package() {
@@ -400,7 +359,6 @@ qt5-serialport-devel_package() {
 		cd ${wrksrc}/qtserialport
 		make INSTALL_ROOT=${PKGDESTDIR} install
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-serialport_package() {
@@ -414,7 +372,6 @@ qt5-serialport_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-svg-devel_package() {
@@ -425,7 +382,6 @@ qt5-svg-devel_package() {
 		make INSTALL_ROOT=${PKGDESTDIR} install
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-svg_package() {
@@ -439,7 +395,6 @@ qt5-svg_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-wayland-devel_package() {
@@ -450,7 +405,6 @@ qt5-wayland-devel_package() {
 		make INSTALL_ROOT=${PKGDESTDIR} install
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-wayland_package() {
@@ -465,7 +419,6 @@ qt5-wayland_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-webchannel-devel_package() {
@@ -476,7 +429,6 @@ qt5-webchannel-devel_package() {
 		make INSTALL_ROOT=${PKGDESTDIR} install
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/qml
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-webchannel_package() {
@@ -490,7 +442,6 @@ qt5-webchannel_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-webengine-devel_package() {
@@ -504,7 +455,6 @@ qt5-webengine-devel_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/libexec
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-webengine_package() {
@@ -518,7 +468,6 @@ qt5-webengine_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-webkit-devel_package() {
@@ -530,7 +479,6 @@ qt5-webkit-devel_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/qml
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/libexec
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-webkit_package() {
@@ -544,7 +492,6 @@ qt5-webkit_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-websockets-devel_package() {
@@ -555,7 +502,6 @@ qt5-websockets-devel_package() {
 		make INSTALL_ROOT=${PKGDESTDIR} install
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/qml
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-websockets_package() {
@@ -569,7 +515,6 @@ qt5-websockets_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-x11extras-devel_package() {
@@ -579,7 +524,6 @@ qt5-x11extras-devel_package() {
 		cd ${wrksrc}/qtx11extras
 		make INSTALL_ROOT=${PKGDESTDIR} install
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-x11extras_package() {
@@ -593,7 +537,6 @@ qt5-x11extras_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-xmlpatterns-devel_package() {
@@ -604,7 +547,6 @@ qt5-xmlpatterns-devel_package() {
 		make INSTALL_ROOT=${PKGDESTDIR} install
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/bin
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-xmlpatterns_package() {
@@ -622,7 +564,6 @@ qt5-xmlpatterns_package() {
 		for f in ${PKGDESTDIR}/usr/lib/qt5/bin/*; do
 			ln -s /usr/lib/qt5/bin/$(basename $f) ${PKGDESTDIR}/usr/bin/$(basename $f)-qt5
 		done
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-translations_package() {
@@ -630,7 +571,6 @@ qt5-translations_package() {
 	pkg_install() {
 		cd ${wrksrc}/qttranslations
 		make INSTALL_ROOT=${PKGDESTDIR} install
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-tools-devel_package() {
@@ -643,7 +583,6 @@ qt5-tools-devel_package() {
 		rm -r ${PKGDESTDIR}/usr/share
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins
 		rm ${PKGDESTDIR}/usr/lib/*.so.*
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-tools_package() {
@@ -682,7 +621,6 @@ qt5-tools_package() {
 		for f in ${PKGDESTDIR}/usr/lib/qt5/bin/*; do
 			ln -s /usr/lib/qt5/bin/$(basename $f) ${PKGDESTDIR}/usr/bin/$(basename $f)-qt5
 		done
-		$(collect_examples $PKGDESTDIR $DESTDIR)
 	}
 }
 qt5-devel_package() {