← Back to branch summary

~ubuntu-branches/ubuntu/precise/python-qt4/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_03_uiparser.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell, Jonathan Riddell
  • Date: 2010-11-08 16:13:33 UTC
  • mfrom: (1.5.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20101108161333-0nec4wu0nz3wpf9r
Tags: 4.8.1-0ubuntu1
[ Jonathan Riddell ]
* New upstream release
* Build against python-sip-dev 4.11.2
* Remove kubuntu_02_fix-scpk-and-flag-issue.diff merged upstream
* Install __init__.py into /usr/lib/python3.2/dist-packages/PyQt4,
  fixes Python 3 support
* Add QtDeclarative to python-qt4
* Add kubuntu_03_uiparser.diff from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_03_uiparser.diff
 
1
Index: PyQt-x11-gpl-4.8.1/pyuic/uic/uiparser.py
 
2
===================================================================
 
3
--- PyQt-x11-gpl-4.8.1.orig/pyuic/uic/uiparser.py       2010-11-08 17:42:10.148327000 +0000
 
4
+++ PyQt-x11-gpl-4.8.1/pyuic/uic/uiparser.py    2010-11-08 17:42:18.768327001 +0000
 
5
@@ -832,7 +832,7 @@
 
6
     def _form_layout_role(grid_position):
 
7
         if grid_position[3] > 1:
 
8
             role = QtGui.QFormLayout.SpanningRole
 
9
-        elif grid_position[1] == 0:
 
10
+        elif grid_position[1] == 1:
 
11
             role = QtGui.QFormLayout.FieldRole
 
12
         else:
 
13
             role = QtGui.QFormLayout.LabelRole