KDE/FreeBSD team presents Qt 4.8.4 and QtCreator 2.6.1 ports.

The area51 repository features commits by Alonso Schaich, avilla, fluffy,
jhale, makc and rakuco.

Common changes:
- Trim Makefile header
- Convert to new option framework
- Add/improve desktop entries
- Remove upstreamed patches

Mk/bsd.qt.mk:
- Set QMAKESPEC at late stage (to fix potential problem if USE_GCC is used) [1]

devel/qmake:
- Fix crash due to off-by one error [2]

multimedia/qt4-phonon*:
- Deprecate in favour of multimedia/phonon*

www/qt4-webkit:
- Make dependence on GStreamer optional [3]

devel/qtcreator:
- Enable qml-designer in devel/qtcreator (requires privite Qt headers) [4]

Reported by:	avg via irc [1]
Submitted by:	avg via maillist [2]
PR:		ports/175644 [3]
Submitted by:	danfe [3]
PR:		ports/169809 [4]
Reported by:	tcb <tcberner at gmail.com> [4]

3 files changed, 4 insertions, 39 deletions

diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 6db3fddef591..ce237d8b6efb 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -1,14 +1,8 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	qt40
-# Date created:				Wed Jun 29 11:49:42 CEST 2005
-# Whom:					lofi@freebsd.org
-#
+# Created by: lofi@freebsd.org
 # $FreeBSD$
-#
 
 PORTNAME=	gui
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	x11-toolkits
 PKGNAMEPREFIX=	qt4-
 
@@ -106,6 +100,8 @@ post-configure:
 		${WRKSRC}/lib/pkgconfig/QtGui.pc
 
 post-install:
+	${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \
+		${PREFIX}/share/pixmaps/qtlogo.png
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt4-gui/files/patch-git_ca89c49 b/x11-toolkits/qt4-gui/files/patch-git_ca89c49
deleted file mode 100644
index 1b8a35947694..000000000000
--- a/x11-toolkits/qt4-gui/files/patch-git_ca89c49
+++ /dev/null
@@ -1,32 +0,0 @@
-From ca89c49fa2c5cbb3945897046f33eed9f7da846c Mon Sep 17 00:00:00 2001
-From: Jiang Jiang <jiang.jiang@nokia.com>
-Date: Tue, 3 Jul 2012 10:17:49 +0200
-Subject: [PATCH] Fix cursor truncate to include line position
-
-Since we could have moved the line position (QTextLine::setPosition),
-the truncating position should be adjusted with that.
-
-Change-Id: Ie1acd4a1b6a4adfbeeb9ce8ee2dfa19d992470e8
-Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
----
- src/gui/text/qtextlayout.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
-index 16f7150..52f2793 100644
---- ./src/gui/text/qtextlayout.cpp
-+++ ./src/gui/text/qtextlayout.cpp
-@@ -2616,8 +2616,8 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
-         x += eng->offsetInLigature(si, pos, end, glyph_pos);
-     }
- 
--    if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.width)
--        x = line.width;
-+    if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.x + line.width)
-+        x = line.x + line.width;
- 
-     *cursorPos = pos + si->position;
-     return x.toReal();
--- 
-1.7.10
-
diff --git a/x11-toolkits/qt4-gui/pkg-plist b/x11-toolkits/qt4-gui/pkg-plist
index ecc28990b887..0022e0e14b8f 100644
--- a/x11-toolkits/qt4-gui/pkg-plist
+++ b/x11-toolkits/qt4-gui/pkg-plist
@@ -1153,6 +1153,7 @@ lib/qt4/libQtGui.so.%%SHLIB_SHVER%%
 lib/qt4/libQtGui.so.%%SHLIB_VER%%
 %%DEBUG%%lib/qt4/libQtGui.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/QtGui.pc
+share/pixmaps/qtlogo.png
 @dirrmtry lib/qt4
 @dirrm include/qt4/QtGui
 @dirrmtry include/qt4/Qt