diff options
Diffstat (limited to 'src/settings/diffmergesettings.ui')
| -rw-r--r-- | src/settings/diffmergesettings.ui | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui index c844c35..2c4019b 100644 --- a/src/settings/diffmergesettings.ui +++ b/src/settings/diffmergesettings.ui @@ -88,7 +88,7 @@ <property name="text"> <string>see "Whats this" for details</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -107,7 +107,7 @@ <property name="text"> <string>Conflict resolver program:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -118,7 +118,7 @@ <property name="text"> <string>External merge program:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -156,7 +156,7 @@ Default: <tt>kdiff3 %o %m %n -o %t</tt> <property name="text"> <string>External diff display:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> |