Fix for Qt5

This commit is contained in:
Michaël Lemaire 2013-05-25 15:46:00 +02:00 committed by Michael Lemaire
parent 4a7fe29a5c
commit fdf77b095f
2 changed files with 26 additions and 25 deletions

1
.gitignore vendored
View file

@ -6,6 +6,7 @@ nbproject/
output/ output/
src/editing/Makefile src/editing/Makefile
*.pro.user *.pro.user
*.pro.user.*
qrc_*.cpp qrc_*.cpp
ui_*.h ui_*.h
tags tags

View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1116</width> <width>1145</width>
<height>726</height> <height>777</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -831,8 +831,8 @@
<slot>brushConfigChanged()</slot> <slot>brushConfigChanged()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>752</x> <x>1115</x>
<y>42</y> <y>53</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>437</x> <x>437</x>
@ -847,8 +847,8 @@
<slot>brushConfigChanged()</slot> <slot>brushConfigChanged()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>919</x> <x>1115</x>
<y>115</y> <y>143</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>437</x> <x>437</x>
@ -879,8 +879,8 @@
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>875</x> <x>1134</x>
<y>580</y> <y>766</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>711</x> <x>711</x>
@ -895,8 +895,8 @@
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>943</x> <x>1134</x>
<y>587</y> <y>766</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>683</x> <x>683</x>
@ -911,8 +911,8 @@
<slot>revert()</slot> <slot>revert()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>943</x> <x>1134</x>
<y>587</y> <y>766</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>747</x> <x>747</x>
@ -927,12 +927,12 @@
<slot>toggleWater(bool)</slot> <slot>toggleWater(bool)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>40</x> <x>60</x>
<y>21</y> <y>43</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>39</x> <x>58</x>
<y>160</y> <y>480</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@ -943,12 +943,12 @@
<slot>toggleGrid(bool)</slot> <slot>toggleGrid(bool)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>102</x> <x>161</x>
<y>17</y> <y>40</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>102</x> <x>121</x>
<y>143</y> <y>463</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@ -972,15 +972,15 @@
<sender>pushButton</sender> <sender>pushButton</sender>
<signal>toggled(bool)</signal> <signal>toggled(bool)</signal>
<receiver>widget_commands</receiver> <receiver>widget_commands</receiver>
<slot>setShown(bool)</slot> <slot>setVisible(bool)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>516</x> <x>734</x>
<y>20</y> <y>40</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>517</x> <x>536</x>
<y>50</y> <y>104</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>