Add bugfix patches from qt-copy

Package-Manager: portage-2.2_rc23/cvs/Linux i686

8 files changed, 338 insertions, 12 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index e72dbd1786e1..c3f1b8959c6b 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.21 2009/01/29 18:51:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.22 2009/01/30 22:15:33 yngwin Exp $
+
+*qt-gui-4.4.2-r2 (30 Jan 2009)
+
+  30 Jan 2009; Ben de Groot <yngwin@gentoo.org>
+  +files/0248-fix-qwidget-scroll-slowness.diff,
+  +files/0256-fix-recursive-backingstore-sync-crash.diff,
+  +files/0262-fix-treeview-animation-crash.diff,
+  +files/0263-fix-fontconfig-handling.diff,
+  +files/0265-fix-formlayoutcrash.diff, +qt-gui-4.4.2-r2.ebuild:
+  Add bugfix patches from KDE's qt-copy
 
   29 Jan 2009; Alexis Ballier <aballier@gentoo.org> qt-gui-4.4.2-r1.ebuild:
   keyword ~x86-fbsd
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index b9843362a229..7636f873cda5 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -1,7 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 0248-fix-qwidget-scroll-slowness.diff 1728 RMD160 3e5019fb99cb4d1bb202d3a7adb324b08d571159 SHA1 87c1d1d5ae496ce3a958b69920dcc6812f657591 SHA256 f420b54109a4450fbac2aa7aeef10f980584da3673f36104f47fc3fb3de6c624
 AUX 0254-fix-qgraphicsproxywidget-deletion-crash.diff 735 RMD160 e52bfad0796a2b3400f34843f6cc9f2f026b6eac SHA1 4f02bd0432177992e921bec76233835c6622395c SHA256 d8bf0c1fd1efce91a75f7b976c6a13ab47e1d8a8f50145cb76480020178d10f2
+AUX 0256-fix-recursive-backingstore-sync-crash.diff 1763 RMD160 3a482c52bca0f4bb0716d9862120c7b24a44ce3a SHA1 0d816fc2c359cf8fdea039b9307faf8e4651f608 SHA256 ee43fdad2f6bcdfb201a4f8b28f6da68a92209b0234ecee7cb66eaf0c37f8463
+AUX 0262-fix-treeview-animation-crash.diff 1491 RMD160 b74520133aba74448d76d30991d28c23d5c8810a SHA1 c73f99d12c36e73343fc84a9f3beab699e8aca45 SHA256 c4c3b368c92f69cd1fd6ab3d6d5f51d16640658477b7f7c962047d74118fa0bd
+AUX 0263-fix-fontconfig-handling.diff 925 RMD160 7c90f57d43fe8287d6a1b2e75f70422d92df7831 SHA1 1c789ff8e6e519a8a58a316088dc22bf44a7d040 SHA256 afa934763530c7fa674526ad5e8387f4e4913cca7ac94d3e9fe12c04284b35ed
+AUX 0265-fix-formlayoutcrash.diff 942 RMD160 5fb1f77bec05db7b6e567923c3f7e69abd737a60 SHA1 da689978030dfc6abe823aa7cf1de4ef3c534722 SHA256 d890a97fb97625dd8e0211c3cb458a45318184d7266636deda909a980f6d02c2
 AUX Designer.desktop 374 RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 SHA1 2ca9fc952d204635a2b62480cf4531faf2938110 SHA256 96a2d2a6c0723c1ce7cbb9fd295eadcc300450ce2b585d1168a380142be0e741
 AUX Linguist.desktop 362 RMD160 ce7f588d57300eb859634cabdccd5331da572c76 SHA1 ba914198e37fbf94a8bcbcbfb33bf0f5b45aec8b SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7
 AUX qt-gui-4.4.0-scrollbars.patch 508 RMD160 fc8f3b529f6abf395643f839af91d87654f6de00 SHA1 ef9b3996d7ad046725c7cc4ea5210e83ed0bcbe6 SHA256 55eaa28bfed52326ad116aa95f77bccce8b1702def464c6f9d225764141d6945
@@ -10,12 +12,6 @@ AUX xinerama.patch 693 RMD160 c5bdfb4184c4b94059b8c095545355a0b5c48643 SHA1 6848
 DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c06959bd57a98e3933636515c60fa SHA1 f0945230b8856b446f03473c18474e9224b30fcf SHA256 aa02d9e2c017ff92d91ef73781d4d1a28be53136886ac99275df053fe31d1fff
 DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0dff7f961af7b371ddd97 SHA1 0bc56934565f529a2708533a4f160fbc87b9d9e0 SHA256 0530fefc452e5029877739164e133de7df5faa519b0fb3d9fcf40b467350c675
 EBUILD qt-gui-4.4.2-r1.ebuild 4587 RMD160 82f7e68ce26abdc0bad95133fd29dbfd198211a6 SHA1 f85f7e2ff30179687370cb4cb975da42d06b5e9e SHA256 6b41d6f51b90b52114aff3b3db50b85a50f9be564e3022fce2e919a917cbd876
-MISC ChangeLog 2964 RMD160 00e6a758a4dcdc520889bab7b21806194cf1bb2b SHA1 c59ccfc181b776ab66e26f96210e6d432c14e0cd SHA256 e664c8b766bedeb558b0f901b0f42b305339f92dc85be76a972ab3f12b939f94
+EBUILD qt-gui-4.4.2-r2.ebuild 4864 RMD160 e98681e48fe4dfcbb03df12ac925b3257ad1a8f2 SHA1 6690462c921f70a5b47e0aa3ac0479d2621964d6 SHA256 50e12380d7e813f72dfc330f125d647fb3897232f69ba62d8dac3d9fefe275df
+MISC ChangeLog 3347 RMD160 c50a4aac207057604dcdfd2c7831662c49dc0c2c SHA1 451a2cb161fa6638589ae67f1b937c21caa1b94f SHA256 78ca3e4f34e896b5d68aa9c5d16fe3244f2810b05d54a620e217c18e8ede43fa
 MISC metadata.xml 426 RMD160 82c15c9cce37ed4f91380dd174d67490902ef824 SHA1 777cc58f7d827e146751de5bb2e1b790ecae2f34 SHA256 ed24a12acb0e487adce4d6f6abade35e273ac48e61c5f6e7109d15b07920c328
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmB+qcACgkQvFcC4BYPU0qkfgCgtHidFSwVLKhVOfntiNY5nv7y
-9v8AnizM8JMnELMPW/9uQjZdVmG2308u
-=5TNF
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/files/0248-fix-qwidget-scroll-slowness.diff b/x11-libs/qt-gui/files/0248-fix-qwidget-scroll-slowness.diff
new file mode 100644
index 000000000000..37595052e85e
--- /dev/null
+++ b/x11-libs/qt-gui/files/0248-fix-qwidget-scroll-slowness.diff
@@ -0,0 +1,43 @@
+qt-bugs@ issue : N227210
+Trolltech task ID : 228764
+bugs.kde.org number : 167739
+applied: no
+author: Germain Garand <germain@ebooksfrance.org>
+
+QWidgetPrivate::scrollRect doesn't account for it's rect argument
+but rather examine the whole widget surface when pondering if
+it can apply accelerated blitting, resulting in unnecessarily slow 
+and non-blitting QWidget::scroll calls.
+
+A modified version of this patch is in Qt 4.5
+
+Index: src/gui/painting/qbackingstore.cpp
+===================================================================
+--- src/gui/painting/qbackingstore.cpp	(révision 860438)
++++ src/gui/painting/qbackingstore.cpp	(copie de travail)
+@@ -523,7 +523,8 @@
+     }
+ 
+     bool overlapped = false;
+-    bool accelerateScroll = accelEnv &&  isOpaque() && !(overlapped = isOverlapped(data.crect));
++    QRect cRect = clipRect();
++    bool accelerateScroll = accelEnv &&  isOpaque() && !(overlapped = isOverlapped(rect & cRect));
+ 
+ #if defined(Q_WS_QWS)
+     QWSWindowSurface *surface;
+@@ -558,13 +559,13 @@
+ #ifdef Q_WS_QWS
+         QWSWindowSurface *surface = static_cast<QWSWindowSurface*>(wbs->windowSurface);
+         const QRegion clip = surface->clipRegion().translated(-toplevelOffset)
+-                             & clipRect();
++                             & cRect;
+         const QRect scrollRect = rect & clip.boundingRect();
+         const QRect destRect = scrollRect.translated(dx, dy)
+                                & scrollRect
+                                &  clip.boundingRect();
+ #else
+-        QRect scrollRect = rect & clipRect();
++        QRect scrollRect = rect & cRect;
+ 
+         QRect destRect = scrollRect.isValid() ? scrollRect.translated(dx,dy).intersected(scrollRect) : QRect();
+ 
diff --git a/x11-libs/qt-gui/files/0256-fix-recursive-backingstore-sync-crash.diff b/x11-libs/qt-gui/files/0256-fix-recursive-backingstore-sync-crash.diff
new file mode 100644
index 000000000000..409ae8f99850
--- /dev/null
+++ b/x11-libs/qt-gui/files/0256-fix-recursive-backingstore-sync-crash.diff
@@ -0,0 +1,40 @@
+qt-bugs@ issue : N227209
+Trolltech task ID : none yet
+bugs.kde.org number : 174065
+applied: yes
+author: Szymon Tomasz Stefanek <s.stefanek@gmail.com>
+
+This patch fixes a crash deep inside the qt painting engine.
+
+The toplevel shared painter is instantiated by the topmost window
+which "owns" the backingstore buffer. The topmost window then recursively
+asks the children to paint themselves with the shared painter.
+With certain widget hierarchies it turns out that the topmost window
+may be asked to paint itself deep inside the recursive painting stack:
+a sort of "hierarchy-looping recursion".
+The window will do the job and then happily destroy the shared
+painter leaving the outer stack frames with a dangling pointer.
+
+This patch stops the "looping recursion" when it's triggered
+with a shared painter already active. The bug doesn't seem to
+be present in qt 4.5 snapshots, but in the meantime we need this fix.
+
+
+Index: src/gui/painting/qbackingstore.cpp
+===================================================================
+--- src/gui/painting/qbackingstore.cpp	(revision 879741)
++++ src/gui/painting/qbackingstore.cpp	(working copy)
+@@ -987,8 +987,12 @@
+             return;
+         }
+ 
+-        if (tlw->updatesEnabled()) {
++        // With certain widget hierarchies we may end up being called recursively
++        // on the same toplevel. This is likely to explode once the painter is released
++        // in the code below (since there is no reference counting). Avoid it.
++        bool alreadyPainting = tlwExtra->sharedPainter && tlwExtra->sharedPainter->isActive();
+ 
++        if (tlw->updatesEnabled() && !alreadyPainting) {
+             // hw: XXX the toClean region is not correct if !dirtyWidgets.isEmpty()
+ 
+             // Pre render config
diff --git a/x11-libs/qt-gui/files/0262-fix-treeview-animation-crash.diff b/x11-libs/qt-gui/files/0262-fix-treeview-animation-crash.diff
new file mode 100644
index 000000000000..c9e021536a1e
--- /dev/null
+++ b/x11-libs/qt-gui/files/0262-fix-treeview-animation-crash.diff
@@ -0,0 +1,46 @@
+Trolltech task ID : 236454
+bugs.kde.org number : 176045
+applied: no
+author: Olivier Goffart
+
+This patch makes sure no deleted items are being accessed during an animation of the treeview
+It will also be contained in the upcoming Qt snapshots
+Index: src/gui/itemviews/qtreeview.cpp
+===================================================================
+--- src/gui/itemviews/qtreeview.cpp	(revision 889029)
++++ src/gui/itemviews/qtreeview.cpp	(working copy)
+@@ -2802,10 +2802,9 @@
+     q->setState(oldState);
+ 
+     if (emitSignal) {
++        emit q->expanded(index);
+         if (animationsEnabled)
+             beginAnimatedOperation();
+-        else
+-            emit q->expanded(index);
+     }
+     if (model->canFetchMore(index))
+         model->fetchMore(index);
+@@ -2843,10 +2842,9 @@
+     q->setState(oldState);
+ 
+     if (emitSignal) {
++        emit q->collapsed(modelIndex);
+         if (animationsEnabled)
+             beginAnimatedOperation();
+-        else
+-            emit q->collapsed(modelIndex);
+     }
+ }
+ 
+@@ -2901,10 +2899,6 @@
+     animatedOperation.before = QPixmap();
+     animatedOperation.after = QPixmap();
+     q->setState(QAbstractItemView::NoState);
+-    if (animatedOperation.type == AnimatedOperation::Expand)
+-        emit q->expanded(viewItems.at(animatedOperation.item).index);
+-    else // operation == AnimatedOperation::Collapse
+-        emit q->collapsed(viewItems.at(animatedOperation.item).index);
+     q->updateGeometries();
+     viewport->update();
+ }
diff --git a/x11-libs/qt-gui/files/0263-fix-fontconfig-handling.diff b/x11-libs/qt-gui/files/0263-fix-fontconfig-handling.diff
new file mode 100644
index 000000000000..483cc93da1d8
--- /dev/null
+++ b/x11-libs/qt-gui/files/0263-fix-fontconfig-handling.diff
@@ -0,0 +1,32 @@
+Trolltech task ID : none
+bugs.kde.org number : none
+applied: no
+author: from Trolltech (fixed in Qt 4.5)
+
+Legacy font-name mappings are also applied when fontconfig is used,
+which breaks fontconfig configuration in subtle ways (sans serif
+is mapped to helvetica for example). Avoid this legacy substitution
+when font config is used.
+
+--- src/gui/text/qfont.cpp
++++ src/gui/text/qfont.cpp
+@@ -59,6 +59,7 @@
+ 
+ #ifdef Q_WS_X11
+ #include "qx11info_x11.h"
++#include <private/qt_x11_p.h>
+ #endif
+ #ifdef Q_WS_QWS
+ #include "qscreen_qws.h"
+@@ -1781,6 +1782,11 @@ static void initFontSubst()
+     if (!fontSubst->isEmpty())
+         return;
+ 
++#if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG)
++    if (X11->has_fontconfig)
++        return;
++#endif
++
+     for (int i=0; initTbl[i] != 0; i += 2) {
+         QStringList &list = (*fontSubst)[QString::fromLatin1(initTbl[i])];
+         list.append(QString::fromLatin1(initTbl[i+1]));
diff --git a/x11-libs/qt-gui/files/0265-fix-formlayoutcrash.diff b/x11-libs/qt-gui/files/0265-fix-formlayoutcrash.diff
new file mode 100644
index 000000000000..f5985e4e302a
--- /dev/null
+++ b/x11-libs/qt-gui/files/0265-fix-formlayoutcrash.diff
@@ -0,0 +1,21 @@
+qt-bugs@ issue : 177767
+Trolltech task ID : 240759
+applied: no
+author: Alexis Menard <alexis.menard@trolltech.com>
+
+Fix a crash in QFormLayout when a layout is alone in a row
+Included in 4.4.4
+
+Index: src/gui/kernel/qlayoutitem.cpp
+===================================================================
+--- src/gui/kernel/qlayoutitem.cpp      (revision 910196)
++++ src/gui/kernel/qlayoutitem.cpp      (working copy)
+@@ -383,6 +383,8 @@ QSizePolicy::ControlTypes QLayoutItem::controlTypes() const
+     if (const QWidget *widget = const_cast<QLayoutItem*>(this)->widget()) {
+         return widget->sizePolicy().controlType();
+     } else if (const QLayout *layout = const_cast<QLayoutItem*>(this)->layout()) {
++        if (layout->count() == 0)
++            return QSizePolicy::DefaultType;
+         QSizePolicy::ControlTypes types;
+         for (int i = layout->count() - 1; i >= 0; --i)
+             types |= layout->itemAt(i)->controlTypes();
diff --git a/x11-libs/qt-gui/qt-gui-4.4.2-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.4.2-r2.ebuild
new file mode 100644
index 000000000000..e6452c1d5f72
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.4.2-r2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.2-r2.ebuild,v 1.1 2009/01/30 22:15:33 yngwin Exp $
+
+EAPI="1"
+inherit eutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+HOMEPAGE="http://www.trolltech.com/"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE_INPUT_DEVICES="input_devices_wacom"
+IUSE="+accessibility cups +dbus debug +glib mng nas nis tiff +qt3support xinerama ${IUSE_INPUT_DEVICES}"
+
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/jpeg
+	media-libs/libpng
+	sys-libs/zlib
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXfont
+	x11-libs/libSM
+	~x11-libs/qt-core-${PV}
+	~x11-libs/qt-script-${PV}
+	cups? ( net-print/cups )
+	dbus? ( ~x11-libs/qt-dbus-${PV} )
+	input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )
+	mng? ( >=media-libs/libmng-1.0.9 )
+	nas? ( >=media-libs/nas-1.5 )
+	tiff? ( media-libs/tiff )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/inputproto"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV} )"
+
+QT4_TARGET_DIRECTORIES="
+src/gui
+tools/designer
+tools/linguist
+src/plugins/imageformats/gif
+src/plugins/imageformats/ico
+src/plugins/imageformats/jpeg"
+QT4_EXTRACT_DIRECTORIES="
+src/tools/rcc/
+tools/shared/"
+
+pkg_setup() {
+	use glib && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
+		~x11-libs/qt-core-${PV} glib"
+	use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
+		~x11-libs/qt-core-${PV} qt3support"
+
+	qt4-build_pkg_setup
+}
+
+src_unpack() {
+	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
+	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
+	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+	${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_src_unpack
+
+	# Apply bugfix patches from qt-copy
+	epatch "${FILESDIR}"/0248-fix-qwidget-scroll-slowness.diff
+	epatch "${FILESDIR}"/0254-fix-qgraphicsproxywidget-deletion-crash.diff
+	epatch "${FILESDIR}"/0256-fix-recursive-backingstore-sync-crash.diff
+	epatch "${FILESDIR}"/0262-fix-treeview-animation-crash.diff
+	epatch "${FILESDIR}"/0263-fix-fontconfig-handling.diff
+	epatch "${FILESDIR}"/0265-fix-formlayoutcrash.diff
+
+	# Don't build plugins this go around, because they depend on qt3support lib
+	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
+}
+
+src_compile() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	local myconf
+	myconf="$(qt_use accessibility)
+		$(qt_use cups)
+		$(qt_use glib)
+		$(qt_use input_devices_wacom tablet)
+		$(qt_use mng libmng system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use dbus qdbus)
+		$(qt_use qt3support)
+		$(qt_use xinerama)"
+
+	use nas	&& myconf="${myconf} -system-nas-sound"
+
+	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-xrender -xrandr -xkb -xshape -sm  -no-svg"
+
+	# Explictly don't compile these packages.
+	# Emerge "qt-webkit", "qt-phonon", etc for their functionality.
+	myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl"
+
+	qt4-build_src_compile
+}
+
+src_install() {
+	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
+		$(use input_devices_wacom && echo tablet) $(usev accessibility)
+		$(usev xinerama) $(usev cups) $(usev nas) gif png system-png system-jpeg
+		$(use mng && echo system-mng) $(use tiff && echo system-tiff)"
+	QCONFIG_REMOVE="no-gif no-png"
+	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
+	$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
+	$(use mng && echo QT_IMAGEFORMAT_MNG) $(use nas && echo QT_NAS)
+	$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
+	$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
+	$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
+	qt4-build_src_install
+
+	# install correct designer and linguist icons, bug 241208
+	dodir /usr/share/pixmaps/ || die "dodir failed"
+	insinto /usr/share/pixmaps/ || die "insinto failed"
+	doins tools/linguist/linguist/images/icons/linguist-128-32.png \
+		tools/designer/src/designer/images/designer.png || die "doins failed"
+	# Note: absolute image path required here!
+	make_desktop_entry /usr/bin/linguist Linguist \
+		/usr/share/pixmaps/linguist-128-32.png 'Qt;Development;GUIDesigner' \
+		|| die "make_desktop_entry failed"
+	make_desktop_entry /usr/bin/designer Designer \
+		/usr/share/pixmaps/designer.png 'Qt;Development;GUIDesigner' \
+		|| die "make_desktop_entry failed"
+}