diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-12-18 17:42:04 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-12-18 17:42:04 +0100 |
| commit | 03717cf7ef47113652688756b4ae2c759472213e (patch) | |
| tree | 0dcac515a424b1b48ea84edb5cc2536b9cbf7f60 /src/plugins/subversion | |
| parent | aa0dc33d325cfd1bb0fce1c597cd851faebdab14 (diff) | |
| parent | 4510d1ef841a76aeca49c883bea9d516febd10c3 (diff) | |
| download | qt-creator-03717cf7ef47113652688756b4ae2c759472213e.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/debugger/gdb/gdboptionspage.cpp
src/plugins/fakevim/fakevimoptions.ui
src/share/share.qbs
Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
Diffstat (limited to 'src/plugins/subversion')
| -rw-r--r-- | src/plugins/subversion/settingspage.ui | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/plugins/subversion/settingspage.ui b/src/plugins/subversion/settingspage.ui index e84f98d776..c040ca41fa 100644 --- a/src/plugins/subversion/settingspage.ui +++ b/src/plugins/subversion/settingspage.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>314</width> - <height>330</height> + <width>665</width> + <height>359</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -90,26 +90,13 @@ </widget> </item> <item row="0" column="2"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>127</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> <widget class="QLabel" name="timeOutLabel"> <property name="text"> <string>Timeout:</string> </property> </widget> </item> - <item row="1" column="1"> + <item row="0" column="3"> <widget class="QSpinBox" name="timeOutSpinBox"> <property name="suffix"> <string>s</string> @@ -122,14 +109,27 @@ </property> </widget> </item> - <item row="2" column="0" colspan="3"> + <item row="0" column="4"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>127</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0" colspan="2"> <widget class="QCheckBox" name="promptToSubmitCheckBox"> <property name="text"> <string>Prompt on submit</string> </property> </widget> </item> - <item row="3" column="0" colspan="3"> + <item row="2" column="0" colspan="4"> <widget class="QCheckBox" name="spaceIgnorantAnnotationCheckBox"> <property name="text"> <string>Ignore whitespace changes in annotation</string> |