qt: install bins to usr/lib/qt/bin and create symlinks in usr/bin.

This in preparation to make qt (4.x) and qt5 cooexist properly via qtchooser.

srcpkgs/qt/files/assistant.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/usr/bin/assistant
+Exec=assistant-qt4
 Name=Qt Assistant
 GenericName=Qt Document Browser
 Icon=assistant

srcpkgs/qt/files/designer.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/usr/bin/designer
+Exec=designer-qt4
 Name=Qt Designer
 GenericName=Interface Designer
 MimeType=application/x-designer

srcpkgs/qt/files/linguist.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/usr/bin/linguist
+Exec=linguist-qt4
 Name=Qt Linguist
 GenericName=Translation Tool
 MimeType=application/x-linguist

srcpkgs/qt/files/qtconfig.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt Config 
 Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
+Exec=qtconfig-qt4
 Icon=qtlogo.png
 Terminal=false
 Type=Application

srcpkgs/qt/template

@@ -1,7 +1,7 @@
 # Template file for 'qt'
 pkgname=qt
 version=4.8.6
-revision=5
+revision=6
 _distname=qt-everywhere-opensource-src
 patch_args="-Np1"
 wrksrc=${_distname}-${version}
@@ -13,7 +13,6 @@ distfiles="http://download.qt-project.org/official_releases/qt/4.8/${version}/${
 checksum=8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
 
 nocross=yes
-
 hostmakedepends="pkg-config"
 makedepends="
  libressl-devel libpng-devel>=1.6 MesaLib-devel libXrender-devel unixodbc-devel
@@ -28,7 +27,6 @@ pre_configure() {
 	sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
 	sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
 }
-
 do_configure() {
 	export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
 	export LD="$CXX"
@@ -37,19 +35,17 @@ do_configure() {
 		-prefix /usr -sysconfdir /etc -plugindir /usr/lib/qt/plugins \
 		-importdir /usr/lib/qt/imports \
 		-translationdir /usr/share/qt/translations \
-		-datadir /usr/share/qt \
+		-datadir /usr/share/qt -bindir /usr/lib/qt/bin \
 		-nomake demos -nomake examples -nomake docs -gtkstyle \
 		-system-sqlite -no-phonon -no-phonon-backend \
 		-graphicssystem raster -openssl-linked -silent -no-rpath \
 		-optimized-qmake -reduce-relocations -dbus-linked -no-openvg
 }
-
 do_build() {
 	export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
 	export LD="$CXX"
 	make ${makejobs}
 }
-
 do_install() {
 	local hicolordir=${DESTDIR}/usr/share/icons/hicolor
 
@@ -77,13 +73,19 @@ do_install() {
 		${DESTDIR}/usr/share/applications
 
 	vinstall LGPL_EXCEPTION.txt 644 usr/share/licenses/qt
+
+	vmkdir usr/bin
+	for f in ${DESTDIR}/usr/lib/qt/bin/*; do
+		ln -s /usr/lib/qt/bin/$(basename $f) ${DESTDIR}/usr/bin/$(basename $f)-qt4
+	done
 }
 
 qt-designer_package() {
 	depends="hicolor-icon-theme"
 	short_desc+=" - GUI designer"
 	pkg_install() {
-		vmove usr/bin/designer
+		vmove usr/bin/designer-qt4
+		vmove usr/lib/qt/bin/designer
 		vmove "usr/lib/libQtDesigner.so*"
 		vmove "usr/lib/libQtDesignerComponents.so*"
 		vmove usr/lib/qt/plugins/designer
@@ -98,7 +100,8 @@ qt-devel-tools_package() {
 	pkg_install() {
 		for f in assistant* lconvert linguist pixeltool qcollectiongenerator \
 			qhelp* xmlpatterns* qttrace* qdoc3 qmlviewer; do
-			vmove usr/bin/${f}
+			vmove usr/bin/${f}-qt4
+			vmove usr/lib/qt/bin/${f}
 		done
 		vmove usr/share/icons/hicolor
 		for f in linguist assistant; do
@@ -115,7 +118,8 @@ qt-devel_package() {
 	pkg_install() {
 		for f in lrelease lupdate moc qdbuscpp2xml qdbusxml2cpp qt3to4 \
 			rcc uic uic3; do
-			vmove usr/bin/${f}
+			vmove usr/bin/${f}-qt4
+			vmove usr/lib/qt/bin/${f}
 		done
 		vmove usr/include
 		vmove "usr/lib/*.a"
@@ -151,7 +155,8 @@ qt-plugin-sqlite_package() {
 qt-qmake_package() {
 	short_desc+=" - qmake Makefile generator tool"
 	pkg_install() {
-		vmove usr/bin/qmake
+		vmove usr/bin/qmake-qt4
+		vmove usr/lib/qt/bin/qmake
 		vmove usr/share/qt/mkspecs
 	}
 }
@@ -159,7 +164,8 @@ qt-qtconfig_package() {
 	depends="hicolor-icon-theme"
 	short_desc+=" - configuration tool"
 	pkg_install() {
-		vmove usr/bin/qtconfig
+		vmove usr/bin/qtconfig-qt4
+		vmove usr/lib/qt/bin/qtconfig
 		vmove usr/share/applications/qtconfig.desktop
 		vmove usr/share/pixmaps/qtlogo.png
 		vmove "usr/share/qt/translations/qtconfig*"