~ubuntu-branches/ubuntu/lucid/qt-x11-free/lucid

« back to all changes in this revision

Viewing changes to debian/patches/0038-dragobject-dont-prefer-unknown.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2009-11-09 14:37:51 UTC
  • mfrom: (0.32.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091109143751-ocohpw4y0j4yi20w
Tags: 3:3.3.8-b-6ubuntu1
* Merge with Debian, remaining changes:
 - Add kubuntu_06_fglrx_0_size_screen.dpatch work around fglrx reporting a 0 size screen.
   Closes https://bugs.launchpad.net/ubuntu/+source/qt-x11-free/+bug/81686
 - Add kubuntu_09_flickerfree_qiconview.dpatch to add
   double-buffering for the icon redraw - prevents flicker on window
   redrawing (LP: #209227)
 - No firebird/ibase build (remove build-dep, control entry, ibase
   ./configure option), firebird is not in Ubuntu main
 - Add debian/qt_plugins_3.3rc and debian/qtrc to set default style to plastique, edit libqt3-mt.install to install them

Show diffs side-by-side

added added

removed removed

Lines of Context:
38
38
 
39
39
--- a/src/kernel/qdragobject.cpp
40
40
+++ b/src/kernel/qdragobject.cpp
41
 
@@ -893,6 +893,16 @@
 
41
@@ -893,6 +893,16 @@ bool QTextDrag::decode( const QMimeSourc
42
42
 {
43
43
     if(!e)
44
44
        return FALSE;