rev 11162 - in trunk/packages/qt4-x11/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-06-28 17:06:42 +0000 (Sat, 28 Jun 2008)
New Revision: 11162

Added:
   trunk/packages/qt4-x11/debian/patches/0233-fix-q3textbrowser-image.diff
   trunk/packages/qt4-x11/debian/patches/21_qprintdialog_honour_fileprintersadded.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
Fix famous QPrintDialog my-pet bug (TT #214505).
* 10 minutes to implement
* 3 hours to build (hrr)
* 3 minutes to test

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-06-28 16:42:55 UTC (rev 11161)
+++ trunk/packages/qt4-x11/debian/changelog	2008-06-28 17:06:42 UTC (rev 11162)
@@ -1,11 +1,20 @@
-qt4-x11 (4.4.0-4) unstable; urgency=low
+qt4-x11 (4.4.0-4~pre1) unstable; urgency=low
 
+  +++ Changes by Sune Vuolera:
+
   * Get patch from 4.4.2 (yes!) to fix painting of scrollbars in webkit with
     some styles.
   * Get patch from 4.4.2 to allow Https to be treated as https in -network.
 
- -- Sune Vuorela <debian at pusling.com>  Wed, 11 Jun 2008 23:22:22 +0200
+  +++ Changes by Modestas Vainius:
 
+  * Add 21_qprintdialog_honour_fileprintersadded.diff patch to fix the problem
+    with QPrintDialog misdetecting some normal printers as virtual file printers
+    on dialog exec and when PrintToFile is disabled (TT #214505).
+  * Add 0233-fix-q3textbrowser-image.diff patch from qt copy.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 28 Jun 2008 15:31:31 +0300
+
 qt4-x11 (4.4.0-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:

Added: trunk/packages/qt4-x11/debian/patches/0233-fix-q3textbrowser-image.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0233-fix-q3textbrowser-image.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0233-fix-q3textbrowser-image.diff	2008-06-28 17:06:42 UTC (rev 11162)
@@ -0,0 +1,22 @@
+qt-bugs@ issue : N217218
+Trolltech task ID : 217145 (Status: closed; Version fix: 4.4.2)
+applied: yes
+author: TT :) (bug reported by Laurent Montel montel at kde.org and patch provides by TT
+
+In qt4.4.x there is a regression in Q3TextBrowser it can load an image.
+
+--- a/src/qt3support/other/q3mimefactory.cpp	2008-06-25 14:30:02 -0000
++++ b/src/qt3support/other/q3mimefactory.cpp	2008-06-25 14:30:02 -0000
+
+@@ -152,9 +152,8 @@
+         QByteArray mimetype("application/octet-stream");
+         if (extensions.contains(e))
+             mimetype = extensions[e].latin1();
+-        QByteArray imgfmt = QImageReader::imageFormat(abs_name);
+-        if (!imgfmt.isEmpty())
+-            mimetype = "image/" + imgfmt.toLower();
++        if (!QImageReader::imageFormat(abs_name).isEmpty())
++            mimetype = "application/x-qt-image";
+ 
+         QFile f(abs_name);
+         if (f.open(QIODevice::ReadOnly) && f.size()) {

Added: trunk/packages/qt4-x11/debian/patches/21_qprintdialog_honour_fileprintersadded.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/21_qprintdialog_honour_fileprintersadded.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/21_qprintdialog_honour_fileprintersadded.diff	2008-06-28 17:06:42 UTC (rev 11162)
@@ -0,0 +1,11 @@
+--- a/src/gui/dialogs/qprintdialog_unix.cpp
++++ b/src/gui/dialogs/qprintdialog_unix.cpp
+@@ -749,7 +749,7 @@
+     Q_ASSERT(index != printerCount - 3); // separator
+     widget.filename->setEnabled(false);
+     widget.lOutput->setEnabled(false);
+-    if (index > printerCount - 3) { // PDF or postscript
++    if (filePrintersAdded && index > printerCount - 3) { // PDF or postscript
+         widget.location->setText(QPrintDialog::tr("Local file"));
+         widget.type->setText(QPrintDialog::tr("Write %1 file").arg(index == printerCount - 2 ?
+                     QString::fromLatin1("PDF") : QString::fromLatin1("Postscript")));

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-06-28 16:42:55 UTC (rev 11161)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-06-28 17:06:42 UTC (rev 11162)
@@ -18,6 +18,7 @@
 0227-qdatastream-regression.diff
 0228-qsortfilterproxymodel-invalidate-noscroll.diff
 0230-qtextcontrol-selectnextword.diff
+0233-fix-q3textbrowser-image.diff
 
 # debian patches
 01_qmake_for_debian.diff
@@ -32,6 +33,7 @@
 14_add_libraries_to_gui_build_where_actually_needed.diff
 15_fix_qmake_makefile_generation.diff
 20_mips_atomic_ops.diff
+21_qprintdialog_honour_fileprintersadded.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff
 50_kfreebsd_build_fix.diff