Skip to content

Commit 347172b

Browse files
author
g_j_m
committed
Resave under Qt designer 4.2.3 rather than 4.3 (fails to compile otherwise)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7935 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 520f3d2 commit 347172b

File tree

2 files changed

+231
-538
lines changed

2 files changed

+231
-538
lines changed

‎src/ui/qgspgquerybuilderbase.ui

+25-90
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
<x>0</x>
99
<y>0</y>
1010
<width>645</width>
11-
<height>533</height>
11+
<height>608</height>
1212
</rect>
1313
</property>
1414
<property name="sizePolicy" >
15-
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
15+
<sizepolicy>
16+
<hsizetype>0</hsizetype>
17+
<vsizetype>0</vsizetype>
1618
<horstretch>0</horstretch>
1719
<verstretch>0</verstretch>
1820
</sizepolicy>
@@ -27,22 +29,10 @@
2729
<bool>true</bool>
2830
</property>
2931
<layout class="QGridLayout" >
30-
<property name="leftMargin" >
31-
<number>9</number>
32+
<property name="margin" >
33+
<number>11</number>
3234
</property>
33-
<property name="topMargin" >
34-
<number>9</number>
35-
</property>
36-
<property name="rightMargin" >
37-
<number>9</number>
38-
</property>
39-
<property name="bottomMargin" >
40-
<number>9</number>
41-
</property>
42-
<property name="horizontalSpacing" >
43-
<number>6</number>
44-
</property>
45-
<property name="verticalSpacing" >
35+
<property name="spacing" >
4636
<number>6</number>
4737
</property>
4838
<item row="2" column="0" colspan="2" >
@@ -51,23 +41,11 @@
5141
<string>Operators</string>
5242
</property>
5343
<layout class="QGridLayout" >
54-
<property name="leftMargin" >
55-
<number>11</number>
56-
</property>
57-
<property name="topMargin" >
58-
<number>11</number>
59-
</property>
60-
<property name="rightMargin" >
44+
<property name="margin" >
6145
<number>11</number>
6246
</property>
63-
<property name="bottomMargin" >
64-
<number>11</number>
65-
</property>
66-
<property name="horizontalSpacing" >
67-
<number>10</number>
68-
</property>
69-
<property name="verticalSpacing" >
70-
<number>10</number>
47+
<property name="spacing" >
48+
<number>6</number>
7149
</property>
7250
<item row="0" column="0" >
7351
<widget class="QPushButton" name="btnEqual" >
@@ -172,21 +150,12 @@
172150
</item>
173151
<item row="4" column="0" colspan="2" >
174152
<layout class="QHBoxLayout" >
153+
<property name="margin" >
154+
<number>11</number>
155+
</property>
175156
<property name="spacing" >
176157
<number>6</number>
177158
</property>
178-
<property name="leftMargin" >
179-
<number>0</number>
180-
</property>
181-
<property name="topMargin" >
182-
<number>0</number>
183-
</property>
184-
<property name="rightMargin" >
185-
<number>0</number>
186-
</property>
187-
<property name="bottomMargin" >
188-
<number>0</number>
189-
</property>
190159
<item>
191160
<spacer>
192161
<property name="orientation" >
@@ -261,7 +230,9 @@
261230
<item row="1" column="1" >
262231
<widget class="QGroupBox" name="groupBox2" >
263232
<property name="sizePolicy" >
264-
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
233+
<sizepolicy>
234+
<hsizetype>0</hsizetype>
235+
<vsizetype>0</vsizetype>
265236
<horstretch>0</horstretch>
266237
<verstretch>0</verstretch>
267238
</sizepolicy>
@@ -270,22 +241,10 @@
270241
<string>Values</string>
271242
</property>
272243
<layout class="QGridLayout" >
273-
<property name="leftMargin" >
274-
<number>10</number>
275-
</property>
276-
<property name="topMargin" >
277-
<number>10</number>
278-
</property>
279-
<property name="rightMargin" >
280-
<number>10</number>
281-
</property>
282-
<property name="bottomMargin" >
283-
<number>10</number>
284-
</property>
285-
<property name="horizontalSpacing" >
286-
<number>6</number>
244+
<property name="margin" >
245+
<number>11</number>
287246
</property>
288-
<property name="verticalSpacing" >
247+
<property name="spacing" >
289248
<number>6</number>
290249
</property>
291250
<item row="2" column="1" >
@@ -314,22 +273,10 @@
314273
<string>Fields</string>
315274
</property>
316275
<layout class="QGridLayout" >
317-
<property name="leftMargin" >
318-
<number>10</number>
319-
</property>
320-
<property name="topMargin" >
321-
<number>10</number>
322-
</property>
323-
<property name="rightMargin" >
324-
<number>10</number>
325-
</property>
326-
<property name="bottomMargin" >
327-
<number>10</number>
328-
</property>
329-
<property name="horizontalSpacing" >
330-
<number>6</number>
276+
<property name="margin" >
277+
<number>11</number>
331278
</property>
332-
<property name="verticalSpacing" >
279+
<property name="spacing" >
333280
<number>6</number>
334281
</property>
335282
<item row="0" column="0" >
@@ -357,22 +304,10 @@
357304
<string>SQL where clause</string>
358305
</property>
359306
<layout class="QGridLayout" >
360-
<property name="leftMargin" >
361-
<number>10</number>
362-
</property>
363-
<property name="topMargin" >
364-
<number>10</number>
365-
</property>
366-
<property name="rightMargin" >
367-
<number>10</number>
368-
</property>
369-
<property name="bottomMargin" >
370-
<number>10</number>
371-
</property>
372-
<property name="horizontalSpacing" >
373-
<number>6</number>
307+
<property name="margin" >
308+
<number>11</number>
374309
</property>
375-
<property name="verticalSpacing" >
310+
<property name="spacing" >
376311
<number>6</number>
377312
</property>
378313
<item row="0" column="0" >

0 commit comments

Comments
 (0)