aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-05-27 15:10:48 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-05-27 15:11:15 +0200
commit329b566e931d3f1b0a8dd319d244432cc740ae9e (patch)
tree06305660998bde374efb5f298b937d6d4bc01d50
parent0681e65ffa4970c01247b705a6774a937756eb08 (diff)
parent72104d1cb6a1ea5b3c529532f2ad7491d26a89a9 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0
-rw-r--r--pyside2uic/uiparser.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/pyside2uic/uiparser.py b/pyside2uic/uiparser.py
index 5f34c92..a6b2dde 100644
--- a/pyside2uic/uiparser.py
+++ b/pyside2uic/uiparser.py
@@ -109,6 +109,12 @@ class UIParser(object):
QtGui = QtGuiModule
QtWidgets = QtWidgetsModule
+ self.column_counter = 0
+ self.row_counter = 0
+ self.item_nr = 0
+ self.itemstack = []
+ self.sorting_enabled = None
+
self.reset()
def uniqueName(self, name):
@@ -159,11 +165,6 @@ class UIParser(object):
return obj
def createWidget(self, elem):
- self.column_counter = 0
- self.row_counter = 0
- self.item_nr = 0
- self.itemstack = []
- self.sorting_enabled = None
widget_class = elem.attrib['class'].replace('::', '.')
if widget_class == 'Line':
@@ -637,6 +638,7 @@ class UIParser(object):
(), False)
if elem.tag == "column":
+ print(self.column_counter)
w.setHorizontalHeaderItem(self.column_counter, item)
if text: