Removed redundant group boxes from options dialog pages

Reviewed-by: Jens Bache-Wiig

13 files changed, 611 insertions, 636 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 739a3ac662..0ef46a5f64 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -266,14 +266,11 @@ QIcon CMakeSettingsPage::categoryIcon() const
 QWidget *CMakeSettingsPage::createPage(QWidget *parent)
 {
     QWidget *outerWidget = new QWidget(parent);
-    QVBoxLayout *outerLayout = new QVBoxLayout(outerWidget);
-    QGroupBox *groupBox = new QGroupBox;
-    outerLayout->addWidget(groupBox);
-    outerLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
-    QFormLayout *formLayout = new QFormLayout(groupBox);
+    QFormLayout *formLayout = new QFormLayout(outerWidget);
     m_pathchooser = new Utils::PathChooser;
     m_pathchooser->setExpectedKind(Utils::PathChooser::Command);
     formLayout->addRow(tr("Executable:"), m_pathchooser);
+    formLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
     m_pathchooser->setPath(cmakeExecutable());
     return outerWidget;
 }
diff --git a/src/plugins/cpaster/codepastersettings.cpp b/src/plugins/cpaster/codepastersettings.cpp
index 1a5d9b98ba..7c6b4d62df 100644
--- a/src/plugins/cpaster/codepastersettings.cpp
+++ b/src/plugins/cpaster/codepastersettings.cpp
@@ -84,24 +84,22 @@ QIcon CodePasterSettingsPage::categoryIcon() const
 
 QWidget *CodePasterSettingsPage::createPage(QWidget *parent)
 {
-    QGroupBox *groupBox = new QGroupBox();
-    QVBoxLayout *groupBoxLayout = new QVBoxLayout(groupBox);
+    QWidget *outerWidget = new QWidget(parent);
+    QVBoxLayout *outerLayout = new QVBoxLayout(outerWidget);
+
     QFormLayout *formLayout = new QFormLayout;
     formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
-    QLineEdit *lineedit = new QLineEdit(m_host);
-    connect(lineedit, SIGNAL(textChanged(QString)), this, SLOT(serverChanged(QString)));
-    formLayout->addRow(tr("Server:"), lineedit);
-    groupBoxLayout->addLayout(formLayout);
-    groupBoxLayout->addSpacerItem(new QSpacerItem(0, 60, QSizePolicy::Ignored, QSizePolicy::Fixed));
+    QLineEdit *lineEdit = new QLineEdit(m_host);
+    connect(lineEdit, SIGNAL(textChanged(QString)), this, SLOT(serverChanged(QString)));
+    formLayout->addRow(tr("Server:"), lineEdit);
+    outerLayout->addLayout(formLayout);
+    outerLayout->addSpacerItem(new QSpacerItem(0, 30, QSizePolicy::Ignored, QSizePolicy::Fixed));
 
     QLabel *noteLabel = new QLabel(tr("Note: Specify the host name for the CodePaster service "
                                       "without any protocol prepended (e.g. codepaster.mycompany.com)."));
     noteLabel->setWordWrap(true);
-    groupBoxLayout->addWidget(noteLabel);
+    outerLayout->addWidget(noteLabel);
 
-    QWidget *outerWidget = new QWidget(parent);
-    QVBoxLayout *outerLayout = new QVBoxLayout(outerWidget);
-    outerLayout->addWidget(groupBox);
     outerLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
     return outerWidget;
 }
diff --git a/src/plugins/cpaster/pastebindotcomsettings.ui b/src/plugins/cpaster/pastebindotcomsettings.ui
index a62fe13765..15d86897c5 100644
--- a/src/plugins/cpaster/pastebindotcomsettings.ui
+++ b/src/plugins/cpaster/pastebindotcomsettings.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>520</width>
-    <height>475</height>
+    <width>549</width>
+    <height>330</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,57 +15,51 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="QGroupBox" name="groupBox">
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <layout class="QFormLayout" name="formLayout">
-        <property name="fieldGrowthPolicy">
-         <enum>QFormLayout::ExpandingFieldsGrow</enum>
-        </property>
-        <item row="0" column="0">
-         <widget class="QLabel" name="serverPrefix">
-          <property name="text">
-           <string>Server Prefix:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="lineEdit"/>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <spacer name="explanatoryTextSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>0</width>
-          <height>60</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="explanatoryTextLabel">
-        <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+    <layout class="QFormLayout" name="formLayout">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::ExpandingFieldsGrow</enum>
+     </property>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="lineEdit"/>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="serverPrefix">
+       <property name="text">
+        <string>Server Prefix:</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="explanatoryTextSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QLabel" name="explanatoryTextLabel">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
 &lt;p&gt;&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows to send posts to custom subdomains (eg. qtcreator.pastebin.com). Fill in the desired prefix.&lt;/p&gt;
 &lt;p&gt;Note that the plugin will use this for posting as well as fetching.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::RichText</enum>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item>
diff --git a/src/plugins/cpaster/settingspage.ui b/src/plugins/cpaster/settingspage.ui
index 8284013ae4..e4566d219e 100644
--- a/src/plugins/cpaster/settingspage.ui
+++ b/src/plugins/cpaster/settingspage.ui
@@ -2,54 +2,16 @@
 <ui version="4.0">
  <class>CodePaster::SettingsPage</class>
  <widget class="QWidget" name="CodePaster::SettingsPage">
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <layout class="QFormLayout" name="formLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="protocolLabel">
-        <property name="text">
-         <string>Default Protocol:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="defaultProtocol"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="userNameLabel">
-        <property name="text">
-         <string>Username:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="userEdit"/>
-      </item>
-      <item row="2" column="0" colspan="2">
-       <widget class="QCheckBox" name="clipboardBox">
-        <property name="text">
-         <string>Copy Paste URL to clipboard</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="2">
-       <widget class="QCheckBox" name="displayBox">
-        <property name="text">
-         <string>Display Output Pane after sending a post</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>281</width>
+    <height>229</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="8" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -62,6 +24,40 @@
      </property>
     </spacer>
    </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QCheckBox" name="displayBox">
+     <property name="text">
+      <string>Display Output Pane after sending a post</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QCheckBox" name="clipboardBox">
+     <property name="text">
+      <string>Copy Paste URL to clipboard</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="userEdit"/>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="userNameLabel">
+     <property name="text">
+      <string>Username:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="defaultProtocol"/>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="protocolLabel">
+     <property name="text">
+      <string>Default protocol:</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 34de700885..db982c6ee8 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -351,6 +351,5 @@ bool CppFileSettingsPage::matches(const QString &s) const
     return m_searchKeywords.contains(s, Qt::CaseInsensitive);
 }
 
-}
-}
-
+} // namespace Internal
+} // namespace CppTools
diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h
index 236cd3abdb..6ee5105165 100644
--- a/src/plugins/cpptools/cppfilesettingspage.h
+++ b/src/plugins/cpptools/cppfilesettingspage.h
@@ -45,7 +45,8 @@ QT_END_NAMESPACE
 namespace CppTools {
 namespace Internal {
 
-struct CppFileSettings {
+struct CppFileSettings
+{
     CppFileSettings();
 
     QString headerSuffix;
@@ -61,15 +62,16 @@ struct CppFileSettings {
     // Currently made public in
     static QString licenseTemplate();
 
-
     bool equals(const CppFileSettings &rhs) const;
 };
 
 inline bool operator==(const CppFileSettings &s1, const CppFileSettings &s2) { return s1.equals(s2); }
 inline bool operator!=(const CppFileSettings &s1, const CppFileSettings &s2) { return !s1.equals(s2); }
 
-class CppFileSettingsWidget : public QWidget {
+class CppFileSettingsWidget : public QWidget
+{
     Q_OBJECT
+
 public:
     explicit CppFileSettingsWidget(QWidget *parent = 0);
     virtual ~CppFileSettingsWidget();
@@ -92,6 +94,7 @@ private:
 class CppFileSettingsPage : public Core::IOptionsPage
 {
     Q_DISABLE_COPY(CppFileSettingsPage)
+
 public:
     explicit CppFileSettingsPage(QSharedPointer<CppFileSettings> &settings,
                                  QObject *parent = 0);
diff --git a/src/plugins/cpptools/cppfilesettingspage.ui b/src/plugins/cpptools/cppfilesettingspage.ui
index 02261b47f1..a6dc2ba0f2 100644
--- a/src/plugins/cpptools/cppfilesettingspage.ui
+++ b/src/plugins/cpptools/cppfilesettingspage.ui
@@ -6,77 +6,93 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>441</width>
-    <height>503</height>
+    <width>283</width>
+    <height>142</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+  <layout class="QFormLayout" name="formLayout">
+   <property name="fieldGrowthPolicy">
+    <enum>QFormLayout::ExpandingFieldsGrow</enum>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="headerSuffixLabel">
+     <property name="text">
+      <string>Header suffix:</string>
      </property>
-     <layout class="QFormLayout" name="formLayout">
-      <property name="fieldGrowthPolicy">
-       <enum>QFormLayout::ExpandingFieldsGrow</enum>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="headerSuffixLabel">
-        <property name="text">
-         <string>Header suffix:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="headerSuffixComboBox"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="sourceSuffixLabel">
-        <property name="text">
-         <string>Source suffix:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="sourceSuffixComboBox"/>
-      </item>
-      <item row="2" column="1">
-       <widget class="QCheckBox" name="lowerCaseFileNamesCheckBox">
-        <property name="text">
-         <string>Lower case file names</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="licenseTemplateLabel">
-        <property name="text">
-         <string>License Template:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="Utils::PathChooser" name="licenseTemplatePathChooser"/>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="headerSuffixComboBox"/>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="sourceSuffixLabel">
+     <property name="text">
+      <string>Source suffix:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="sourceSuffixComboBox"/>
+   </item>
+   <item row="2" column="1">
+    <widget class="QCheckBox" name="lowerCaseFileNamesCheckBox">
+     <property name="text">
+      <string>Lower case file names</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="licenseTemplateLabel">
+     <property name="text">
+      <string>License Template:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="Utils::PathChooser" name="licenseTemplatePathChooser" native="true"/>
+   </item>
+   <item row="4" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>20</width>
-       <height>430</height>
+       <width>0</width>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
+  <zorder>licenseTemplatePathChooser</zorder>
+  <zorder>sourceSuffixLabel</zorder>
+  <zorder>headerSuffixLabel</zorder>
+  <zorder>lowerCaseFileNamesCheckBox</zorder>
+  <zorder>headerSuffixComboBox</zorder>
+  <zorder>sourceSuffixComboBox</zorder>
+  <zorder>licenseTemplateLabel</zorder>
+  <zorder>licenseTemplatePathChooser</zorder>
+  <zorder>sourceSuffixLabel</zorder>
+  <zorder>headerSuffixLabel</zorder>
+  <zorder>lowerCaseFileNamesCheckBox</zorder>
+  <zorder>headerSuffixComboBox</zorder>
+  <zorder>sourceSuffixComboBox</zorder>
+  <zorder>licenseTemplateLabel</zorder>
+  <zorder>licenseTemplatePathChooser</zorder>
+  <zorder>sourceSuffixLabel</zorder>
+  <zorder>headerSuffixLabel</zorder>
+  <zorder>lowerCaseFileNamesCheckBox</zorder>
+  <zorder>headerSuffixComboBox</zorder>
+  <zorder>sourceSuffixComboBox</zorder>
+  <zorder>licenseTemplateLabel</zorder>
+  <zorder>licenseTemplatePathChooser</zorder>
+  <zorder>sourceSuffixLabel</zorder>
+  <zorder>headerSuffixLabel</zorder>
+  <zorder>lowerCaseFileNamesCheckBox</zorder>
+  <zorder>headerSuffixComboBox</zorder>
+  <zorder>sourceSuffixComboBox</zorder>
+  <zorder>licenseTemplateLabel</zorder>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/plugins/locator/locatorfiltersfilter.h b/src/plugins/locator/locatorfiltersfilter.h
index 86b48bfd80..ea7d5d75aa 100644
--- a/src/plugins/locator/locatorfiltersfilter.h
+++ b/src/plugins/locator/locatorfiltersfilter.h
@@ -50,7 +50,7 @@ class LocatorFiltersFilter : public ILocatorFilter
 
 public:
     LocatorFiltersFilter(LocatorPlugin *plugin,
-                           LocatorWidget *locatorWidget);
+                         LocatorWidget *locatorWidget);
 
     // ILocatorFilter
     QString displayName() const;
diff --git a/src/plugins/locator/settingspage.ui b/src/plugins/locator/settingspage.ui
index 3fdc38b88a..b6c27d3056 100644
--- a/src/plugins/locator/settingspage.ui
+++ b/src/plugins/locator/settingspage.ui
@@ -6,72 +6,66 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>460</width>
-    <height>353</height>
+    <width>367</width>
+    <height>242</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Configure Filters</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="configurationGroupBox">
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QListWidget" name="filterList">
-        <property name="font">
-         <font/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <layout class="QVBoxLayout">
-        <item>
-         <widget class="QPushButton" name="addButton">
-          <property name="text">
-           <string>Add</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="removeButton">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>Remove</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="editButton">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>Edit</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-     </layout>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QListWidget" name="filterList">
+     <property name="font">
+      <font/>
+     </property>
     </widget>
    </item>
-   <item>
+   <item row="0" column="1">
+    <layout class="QVBoxLayout">
+     <item>
+      <widget class="QPushButton" name="addButton">
+       <property name="text">
+        <string>Add</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="removeButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="editButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Edit</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="2">
     <layout class="QHBoxLayout">
      <item>
       <widget class="QLabel" name="refreshIntervalLabel">
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui
index 3333a752ea..6841bd023b 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui
@@ -6,89 +6,86 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>282</width>
-    <height>296</height>
+    <width>274</width>
+    <height>264</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="groupBox">
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QTreeWidget" name="list">
-        <property name="indentation">
-         <number>0</number>
-        </property>
-        <property name="rootIsDecorated">
-         <bool>false</bool>
-        </property>
-        <property name="uniformRowHeights">
-         <bool>true</bool>
-        </property>
-        <property name="columnCount">
-         <number>2</number>
-        </property>
-        <attribute name="headerCascadingSectionResizes">
-         <bool>true</bool>
-        </attribute>
-        <column>
-         <property name="text">
-          <string>SDK Location</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Qt Location</string>
-         </property>
-        </column>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="errorLabel">
-        <property name="styleSheet">
-         <string notr="true">background-color: red;</string>
-        </property>
-        <property name="text">
-         <string>Error</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-        <property name="textInteractionFlags">
-         <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="refreshButton">
-          <property name="text">
-           <string>Refresh</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
+    <widget class="QTreeWidget" name="list">
+     <property name="indentation">
+      <number>0</number>
+     </property>
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="uniformRowHeights">
+      <bool>true</bool>
+     </property>
+     <property name="columnCount">
+      <number>2</number>
+     </property>
+     <attribute name="headerCascadingSectionResizes">
+      <bool>true</bool>
+     </attribute>
+     <attribute name="headerCascadingSectionResizes">
+      <bool>true</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string>SDK Location</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Qt Location</string>
+      </property>
+     </column>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="errorLabel">
+     <property name="styleSheet">
+      <string notr="true">color: red;</string>
+     </property>
+     <property name="text">
+      <string>Error</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="refreshButton">
+       <property name="text">
+        <string>Refresh</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index 91a9e8aca0..ed2a1669e4 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -744,8 +744,7 @@ QString QtOptionsPageWidget::searchKeywords() const
             << ' ' << m_ui->msvcLabel->text()
             << ' ' << m_ui->gcceLabel->text()
             << ' ' << m_ui->mwcLabel->text()
-            << ' ' << m_ui->debuggingHelperLabel->text()
-            << ' ' << m_ui->versionListGroupBox->title();
+            << ' ' << m_ui->debuggingHelperLabel->text();
     rc.remove(QLatin1Char('&'));
     return rc;
 }
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui
index b1c3ca224d..4ab4480a79 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.ui
+++ b/src/plugins/qt4projectmanager/qtversionmanager.ui
@@ -6,244 +6,235 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>431</width>
-    <height>474</height>
+    <width>400</width>
+    <height>424</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="versionListGroupBox">
-     <property name="title">
-      <string>Qt versions</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QTreeWidget" name="qtdirList">
-          <property name="uniformRowHeights">
-           <bool>true</bool>
-          </property>
-          <property name="columnCount">
-           <number>3</number>
-          </property>
-          <column>
-           <property name="text">
-            <string>Name</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>qmake Location</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Debugging Helper</string>
-           </property>
-          </column>
-         </widget>
-        </item>
-        <item>
-         <layout class="QVBoxLayout">
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QToolButton" name="addButton">
-            <property name="minimumSize">
-             <size>
-              <width>21</width>
-              <height>23</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>+</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="delButton">
-            <property name="minimumSize">
-             <size>
-              <width>21</width>
-              <height>23</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>-</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer>
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>10</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
-         <widget class="QLabel" name="versionNameLabel">
-          <property name="text">
-           <string>Version Name:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="nameEdit"/>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="pathLabel">
-          <property name="text">
-           <string>qmake Location:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="Utils::PathChooser" name="qmakePath" native="true"/>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="mingwLabel">
-          <property name="text">
-           <string>MinGW Directory:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="Utils::PathChooser" name="mingwPath" native="true"/>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="msvcLabel">
-          <property name="text">
-           <string>Toolchain:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1">
-         <layout class="QHBoxLayout" name="msvcHorizontalLayout">
-          <item>
-           <widget class="QComboBox" name="msvcComboBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="msvcNotFoundLabel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QTreeWidget" name="qtdirList">
+       <property name="uniformRowHeights">
+        <bool>true</bool>
+       </property>
+       <property name="columnCount">
+        <number>3</number>
+       </property>
+       <column>
+        <property name="text">
+         <string>Name</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>qmake Location</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Debugging Helper</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QToolButton" name="addButton">
+         <property name="minimumSize">
+          <size>
+           <width>21</width>
+           <height>23</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>+</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="delButton">
+         <property name="minimumSize">
+          <size>
+           <width>21</width>
+           <height>23</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>-</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>10</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="versionNameLabel">
+       <property name="text">
+        <string>Version Name:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="nameEdit"/>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="pathLabel">
+       <property name="text">
+        <string>qmake Location:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="Utils::PathChooser" name="qmakePath" native="true"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="mingwLabel">
+       <property name="text">
+        <string>MinGW Directory:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="Utils::PathChooser" name="mingwPath" native="true"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="msvcLabel">
+       <property name="text">
+        <string>Toolchain:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <layout class="QHBoxLayout" name="msvcHorizontalLayout">
+       <item>
+        <widget class="QComboBox" name="msvcComboBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="msvcNotFoundLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;Unable to detect MSVC version.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="s60SDKLabel">
-          <property name="text">
-           <string>S60 SDK:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1">
-         <widget class="Utils::PathChooser" name="s60SDKPath" native="true"/>
-        </item>
-        <item row="5" column="0">
-         <widget class="QLabel" name="gcceLabel">
-          <property name="text">
-           <string>CSL/GCCE Directory:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="1">
-         <widget class="Utils::PathChooser" name="gccePath" native="true"/>
-        </item>
-        <item row="6" column="0">
-         <widget class="QLabel" name="mwcLabel">
-          <property name="text">
-           <string>Carbide Directory:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="1">
-         <widget class="Utils::PathChooser" name="mwcPath" native="true"/>
-        </item>
-        <item row="7" column="0">
-         <widget class="QLabel" name="debuggingHelperLabel">
-          <property name="text">
-           <string>Debugging Helper:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="7" column="1">
-         <layout class="QHBoxLayout" name="debuggingHelperHorizontalLayout">
-          <item>
-           <widget class="QLabel" name="debuggingHelperStateLabel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="showLogButton">
-            <property name="text">
-             <string>Show &amp;Log</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="rebuildButton">
-            <property name="text">
-             <string>&amp;Rebuild</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="8" column="0" colspan="2">
-         <widget class="QLabel" name="errorLabel">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="s60SDKLabel">
+       <property name="text">
+        <string>S60 SDK:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="Utils::PathChooser" name="s60SDKPath" native="true"/>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="gcceLabel">
+       <property name="text">
+        <string>CSL/GCCE Directory:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="Utils::PathChooser" name="gccePath" native="true"/>
+     </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="mwcLabel">
+       <property name="text">
+        <string>Carbide Directory:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="Utils::PathChooser" name="mwcPath" native="true"/>
+     </item>
+     <item row="7" column="0">
+      <widget class="QLabel" name="debuggingHelperLabel">
+       <property name="text">
+        <string>Debugging Helper:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <layout class="QHBoxLayout" name="debuggingHelperHorizontalLayout">
+       <item>
+        <widget class="QLabel" name="debuggingHelperStateLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="showLogButton">
+         <property name="text">
+          <string>Show &amp;Log</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="rebuildButton">
+         <property name="text">
+          <string>&amp;Rebuild</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="8" column="0" colspan="2">
+      <widget class="QLabel" name="errorLabel">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
diff --git a/src/plugins/vcsbase/commonsettingspage.ui b/src/plugins/vcsbase/commonsettingspage.ui
index e1ff7cb652..16065aa48f 100644
--- a/src/plugins/vcsbase/commonsettingspage.ui
+++ b/src/plugins/vcsbase/commonsettingspage.ui
@@ -6,100 +6,91 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>408</width>
-    <height>148</height>
+    <width>359</width>
+    <height>105</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="commonGroupBox">
-     <property name="title">
-      <string>Common Settings</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="lineWrapCheckBox">
-        <property name="text">
-         <string>Wrap submit message at:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QSpinBox" name="lineWrapSpinBox">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="suffix">
-         <string> characters</string>
-        </property>
-        <property name="minimum">
-         <number>40</number>
-        </property>
-        <property name="maximum">
-         <number>200</number>
-        </property>
-        <property name="value">
-         <number>72</number>
-        </property>
-       </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>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="submitMessageCheckScriptLabel">
-        <property name="toolTip">
-         <string>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</string>
-        </property>
-        <property name="text">
-         <string>Submit message check script:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" colspan="2">
-       <widget class="Utils::PathChooser" name="submitMessageCheckScriptChooser" native="true"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="nickNameMailMapLabel">
-        <property name="toolTip">
-         <string>A file listing user names and email addresses in a 4-column mailmap format:
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QCheckBox" name="lineWrapCheckBox">
+     <property name="text">
+      <string>Wrap submit message at:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QSpinBox" name="lineWrapSpinBox">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="suffix">
+      <string> characters</string>
+     </property>
+     <property name="minimum">
+      <number>40</number>
+     </property>
+     <property name="maximum">
+      <number>200</number>
+     </property>
+     <property name="value">
+      <number>72</number>
+     </property>
+    </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>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="submitMessageCheckScriptLabel">
+     <property name="toolTip">
+      <string>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</string>
+     </property>
+     <property name="text">
+      <string>Submit message check script:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="Utils::PathChooser" name="submitMessageCheckScriptChooser" native="true"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="nickNameMailMapLabel">
+     <property name="toolTip">
+      <string>A file listing user names and email addresses in a 4-column mailmap format:
 name &lt;email&gt; alias &lt;email&gt;</string>
-        </property>
-        <property name="text">
-         <string>User/alias configuration file:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2">
-       <widget class="Utils::PathChooser" name="nickNameMailMapChooser" native="true"/>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="nickNameFieldsFileLabel">
-        <property name="toolTip">
-         <string>A simple file containing lines with field names like &quot;Reviewed-By:&quot; which will be added below the submit editor.</string>
-        </property>
-        <property name="text">
-         <string>User fields configuration file:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="Utils::PathChooser" name="nickNameFieldsFileChooser" native="true"/>
-      </item>
-     </layout>
+     </property>
+     <property name="text">
+      <string>User/alias configuration file:</string>
+     </property>
     </widget>
    </item>
-   <item>
+   <item row="2" column="1" colspan="2">
+    <widget class="Utils::PathChooser" name="nickNameMailMapChooser" native="true"/>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="nickNameFieldsFileLabel">
+     <property name="toolTip">
+      <string>A simple file containing lines with field names like &quot;Reviewed-By:&quot; which will be added below the submit editor.</string>
+     </property>
+     <property name="text">
+      <string>User fields configuration file:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" colspan="2">
+    <widget class="Utils::PathChooser" name="nickNameFieldsFileChooser" native="true"/>
+   </item>
+   <item row="4" column="0" colspan="3">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -134,12 +125,12 @@ name &lt;email&gt; alias &lt;email&gt;</string>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>195</x>
-     <y>46</y>
+     <x>175</x>
+     <y>21</y>
     </hint>
     <hint type="destinationlabel">
-     <x>240</x>
-     <y>45</y>
+     <x>216</x>
+     <y>21</y>
     </hint>
    </hints>
   </connection>