diff --git a/documentation/documentationfindwidget.ui b/documentation/documentationfindwidget.ui
index ce07311f2..e8f305a23 100644
--- a/documentation/documentationfindwidget.ui
+++ b/documentation/documentationfindwidget.ui
@@ -1,93 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>FindWidget</class>
  <widget class="QWidget" name="FindWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>696</width>
     <height>46</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
     <widget class="QToolButton" name="hideButton">
      <property name="text">
       <string>...</string>
      </property>
      <property name="autoRaise">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Find:</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QLineEdit" name="findText">
      <property name="showClearButton" stdset="0">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QPushButton" name="nextButton">
      <property name="text">
       <string>Next</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QPushButton" name="previousButton">
      <property name="text">
       <string>Previous</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QCheckBox" name="matchCase">
      <property name="text">
       <string>Match case</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>hideButton</sender>
    <signal>clicked()</signal>
    <receiver>FindWidget</receiver>
    <slot>hide()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>19</x>
      <y>12</y>
     </hint>
     <hint type="destinationlabel">
      <x>54</x>
      <y>29</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/appwizard/projectselectionpage.ui b/plugins/appwizard/projectselectionpage.ui
index 1e7365819..008363572 100644
--- a/plugins/appwizard/projectselectionpage.ui
+++ b/plugins/appwizard/projectselectionpage.ui
@@ -1,175 +1,175 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ProjectSelectionPage</class>
  <widget class="QWidget" name="ProjectSelectionPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>807</width>
     <height>598</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="2" column="0" colspan="2">
     <widget class="QGroupBox" name="propertiesBox">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Properties</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="appNameLabel">
         <property name="text">
          <string>Application Name:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="appNameEdit"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="locationLabel">
         <property name="text">
          <string>Location:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="locationUrl"/>
       </item>
       <item row="2" column="0" colspan="2">
        <widget class="KMessageWidget" name="locationValidWidget"/>
       </item>
      </layout>
     </widget>
    </item>
    <item row="0" column="1" rowspan="2">
     <widget class="QFrame" name="descriptionFrame">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>300</width>
        <height>400</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
        <width>300</width>
        <height>16777215</height>
       </size>
      </property>
      <property name="autoFillBackground">
       <bool>false</bool>
      </property>
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="spacing">
        <number>0</number>
       </property>
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
        <widget class="QWidget" name="descriptionContent" native="true">
         <property name="autoFillBackground">
          <bool>true</bool>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout">
          <item>
           <widget class="QLabel" name="header">
            <property name="text">
             <string notr="true"/>
            </property>
            <property name="alignment">
             <set>Qt::AlignHCenter|Qt::AlignTop</set>
            </property>
            <property name="wordWrap">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QComboBox" name="templateType"/>
          </item>
          <item>
           <widget class="QLabel" name="icon">
            <property name="text">
             <string/>
            </property>
            <property name="alignment">
             <set>Qt::AlignHCenter|Qt::AlignTop</set>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLabel" name="description">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="alignment">
             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
            </property>
            <property name="wordWrap">
             <bool>true</bool>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
    <header location="global">kmessagewidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>appNameEdit</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/cvs/checkoutdialog.ui b/plugins/cvs/checkoutdialog.ui
index ffa6dc903..404b795bc 100644
--- a/plugins/cvs/checkoutdialog.ui
+++ b/plugins/cvs/checkoutdialog.ui
@@ -1,161 +1,161 @@
 <ui version="4.0" >
  <class>CheckoutDialogBase</class>
  <widget class="QDialog" name="CheckoutDialogBase" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>252</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Checkout</string>
   </property>
   <layout class="QVBoxLayout" >
    <item>
     <layout class="QVBoxLayout" >
      <item>
       <widget class="QLabel" name="textLabel1" >
        <property name="text" >
         <string>&amp;Local destination directory:</string>
        </property>
        <property name="wordWrap" >
         <bool>false</bool>
        </property>
        <property name="buddy" >
         <cstring>localWorkingDir</cstring>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KUrlRequester" name="localWorkingDir" />
      </item>
     </layout>
    </item>
    <item>
     <layout class="QVBoxLayout" >
      <item>
       <widget class="QLabel" name="textLabel2" >
        <property name="sizePolicy" >
         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text" >
         <string>&amp;Server path (e.g. :pserver:username@cvs.example.com:/cvsroot):</string>
        </property>
        <property name="wordWrap" >
         <bool>false</bool>
        </property>
        <property name="buddy" >
         <cstring>serverPath</cstring>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLineEdit" name="serverPath" />
      </item>
     </layout>
    </item>
    <item>
     <layout class="QVBoxLayout" >
      <item>
       <widget class="QLabel" name="textLabel3" >
        <property name="text" >
         <string>&amp;Module:</string>
        </property>
        <property name="buddy" >
         <cstring>module</cstring>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KComboBox" name="module" >
        <property name="editable" >
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QVBoxLayout" >
      <item>
       <widget class="QLabel" name="textLabel4" >
        <property name="text" >
         <string>Tag/Branch:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLineEdit" name="tag" />
      </item>
     </layout>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox" >
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons" >
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>QLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>CheckoutDialogBase</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>248</x>
      <y>254</y>
     </hint>
     <hint type="destinationlabel" >
      <x>157</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>CheckoutDialogBase</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>316</x>
      <y>260</y>
     </hint>
     <hint type="destinationlabel" >
      <x>286</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/cvs/importmetadatawidget.ui b/plugins/cvs/importmetadatawidget.ui
index 7505357c3..1aafbb903 100644
--- a/plugins/cvs/importmetadatawidget.ui
+++ b/plugins/cvs/importmetadatawidget.ui
@@ -1,172 +1,172 @@
 <ui version="4.0" >
  <class>ImportMetadataWidget</class>
  <widget class="QWidget" name="ImportMetadataWidget" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>581</width>
     <height>261</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Import</string>
   </property>
   <layout class="QGridLayout" >
    <item row="0" column="0" >
     <widget class="QLabel" name="labelUrl" >
      <property name="text" >
       <string>Source Directory:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1" >
     <widget class="KUrlRequester" name="sourceLoc" />
    </item>
    <item row="1" column="0" >
     <widget class="QLabel" name="repositoryLabel" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string>&amp;Repository:</string>
      </property>
      <property name="wordWrap" >
       <bool>false</bool>
      </property>
      <property name="buddy" >
       <cstring>repository</cstring>
      </property>
     </widget>
    </item>
    <item row="1" column="1" >
     <widget class="QLineEdit" name="repository" />
    </item>
    <item row="2" column="0" >
     <widget class="QLabel" name="moduleLabel" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string>Mo&amp;dule:</string>
      </property>
      <property name="wordWrap" >
       <bool>false</bool>
      </property>
      <property name="buddy" >
       <cstring>module</cstring>
      </property>
     </widget>
    </item>
    <item row="2" column="1" >
     <widget class="QLineEdit" name="module" />
    </item>
    <item row="3" column="0" >
     <widget class="QLabel" name="vendorLabel" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string>&amp;Vendor tag:</string>
      </property>
      <property name="wordWrap" >
       <bool>false</bool>
      </property>
      <property name="buddy" >
       <cstring>vendorTag</cstring>
      </property>
     </widget>
    </item>
    <item row="3" column="1" >
     <widget class="QLineEdit" name="vendorTag" >
      <property name="text" >
       <string>vendor</string>
      </property>
     </widget>
    </item>
    <item row="4" column="0" >
     <widget class="QLabel" name="releaseLabel" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string>Re&amp;lease tag:</string>
      </property>
      <property name="wordWrap" >
       <bool>false</bool>
      </property>
      <property name="buddy" >
       <cstring>releaseTag</cstring>
      </property>
     </widget>
    </item>
    <item row="4" column="1" >
     <widget class="QLineEdit" name="releaseTag" >
      <property name="text" >
       <string>start</string>
      </property>
     </widget>
    </item>
    <item row="5" column="0" >
     <widget class="QLabel" name="commentLabel" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string>Co&amp;mment:</string>
      </property>
      <property name="wordWrap" >
       <bool>false</bool>
      </property>
      <property name="buddy" >
       <cstring>comment</cstring>
      </property>
     </widget>
    </item>
    <item row="5" column="1" >
     <widget class="KTextEdit" name="comment" />
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>QLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
    <class>KTextEdit</class>
    <extends>QTextEdit</extends>
    <header>ktextedit.h</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>repository</tabstop>
   <tabstop>module</tabstop>
   <tabstop>vendorTag</tabstop>
   <tabstop>releaseTag</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/executescript/scriptappconfig.ui b/plugins/executescript/scriptappconfig.ui
index 92f9e4aaf..bafd49658 100644
--- a/plugins/executescript/scriptappconfig.ui
+++ b/plugins/executescript/scriptappconfig.ui
@@ -1,400 +1,395 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ScriptAppPage</class>
  <widget class="QWidget" name="ScriptAppPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>675</width>
     <height>510</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Interpreter</string>
      </property>
      <layout class="QFormLayout" name="formLayout_3">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
       </property>
       <property name="labelAlignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <property name="formAlignment">
        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Script interpreter:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QComboBox" name="interpreter">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="editable">
          <bool>true</bool>
         </property>
         <item>
          <property name="text">
           <string/>
          </property>
         </item>
         <item>
          <property name="text">
           <string>python</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>ruby</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>bash</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>php</string>
          </property>
         </item>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_4">
      <property name="title">
       <string>Script file</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QRadioButton" name="runCurrentFile">
         <property name="text">
          <string>Run the file currently open in the editor</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="runFixedFile">
         <property name="text">
          <string>Always run the same file</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QLabel" name="scriptLabel">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="text">
            <string>Script file:</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KUrlRequester" name="executablePath">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="placeholderText" stdset="0">
            <string>Enter the absolute path to the script to run</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Behavior</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::ExpandingFieldsGrow</enum>
       </property>
       <property name="labelAlignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Arguments:</string>
         </property>
         <property name="buddy">
          <cstring>arguments</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="arguments">
         <property name="toolTip">
          <string>Enter arguments to give to the executable</string>
         </property>
         <property name="placeholderText">
          <string/>
         </property>
         <property name="placeholderText" stdset="0">
          <string>Enter arguments to give to the executable</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Working Directory:</string>
         </property>
         <property name="buddy">
          <cstring>workingDirectory</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="workingDirectory">
         <property name="toolTip">
          <string>Select a working directory for the executable</string>
         </property>
         <property name="placeholderText" stdset="0">
          <string>Select a working directory for the executable</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
          <string>Environment:</string>
         </property>
         <property name="buddy">
          <cstring>environment</cstring>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="KDevelop::EnvironmentSelectionWidget" name="environment">
         <property name="toolTip">
          <string>Select an environment to be used</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
          <string>Output Filter:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QComboBox" name="outputFilteringMode">
         <property name="toolTip">
          <string>Select the filter to applied to the output. E.g. to mark errors with red text</string>
         </property>
         <item>
          <property name="text">
           <string>No Filter</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Compiler Filter</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Script Error Filter</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Static Analysis Filter</string>
          </property>
         </item>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Execute on Host</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QCheckBox" name="remoteHostCheckbox">
         <property name="text">
          <string>Execute on remote host</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <widget class="QLabel" name="remoteHostLabel">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="text">
            <string>Remote host (ssh):</string>
           </property>
           <property name="buddy">
            <cstring>remoteHost</cstring>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLineEdit" name="remoteHost">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="placeholderText" stdset="0">
            <string>Enter a remote host (user@example.com)</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <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>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentSelectionWidget</class>
    <extends>KComboBox</extends>
    <header>util/environmentselectionwidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>arguments</tabstop>
   <tabstop>workingDirectory</tabstop>
   <tabstop>environment</tabstop>
   <tabstop>outputFilteringMode</tabstop>
   <tabstop>remoteHost</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>runFixedFile</sender>
    <signal>toggled(bool)</signal>
    <receiver>executablePath</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>337</x>
      <y>157</y>
     </hint>
     <hint type="destinationlabel">
      <x>337</x>
      <y>179</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>remoteHostCheckbox</sender>
    <signal>toggled(bool)</signal>
    <receiver>remoteHostLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>337</x>
      <y>413</y>
     </hint>
     <hint type="destinationlabel">
      <x>86</x>
      <y>443</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>remoteHostCheckbox</sender>
    <signal>toggled(bool)</signal>
    <receiver>remoteHost</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>337</x>
      <y>413</y>
     </hint>
     <hint type="destinationlabel">
      <x>401</x>
      <y>443</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>runFixedFile</sender>
    <signal>toggled(bool)</signal>
    <receiver>scriptLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>337</x>
      <y>157</y>
     </hint>
     <hint type="destinationlabel">
      <x>179</x>
      <y>183</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/externalscript/externalscriptview.ui b/plugins/externalscript/externalscriptview.ui
index bcdecad2e..e11d599c0 100644
--- a/plugins/externalscript/externalscriptview.ui
+++ b/plugins/externalscript/externalscriptview.ui
@@ -1,65 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <author>Robert Gruber &lt;rgruber@users.salomon.at&gt;</author>
  <class>ExternalScriptViewBase</class>
  <widget class="QWidget" name="ExternalScriptViewBase">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>210</width>
     <height>377</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
    <property name="spacing">
     <number>2</number>
    </property>
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout">
      <property name="spacing">
       <number>0</number>
      </property>
      <item>
       <widget class="QLineEdit" name="filterText">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="toolTip">
         <string>Define filter here</string>
        </property>
        <property name="placeholderText">
         <string>Filter...</string>
        </property>
        <property name="showClearButton" stdset="0">
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QTreeView" name="scriptTree"/>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>filterText</tabstop>
   <tabstop>scriptTree</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filetemplates/filetemplatesplugin.cpp b/plugins/filetemplates/filetemplatesplugin.cpp
index 25803372b..954cc2ce9 100644
--- a/plugins/filetemplates/filetemplatesplugin.cpp
+++ b/plugins/filetemplates/filetemplatesplugin.cpp
@@ -1,288 +1,317 @@
 #include "filetemplatesplugin.h"
 #include "templateclassassistant.h"
 #include "templatepreviewtoolview.h"
 #include "debug.h"
 
 #include <language/codegen/templatesmodel.h>
 #include <language/interfaces/editorcontext.h>
 #include <interfaces/icore.h>
+#include <interfaces/iproject.h>
 #include <interfaces/iuicontroller.h>
 #include <interfaces/context.h>
 #include <interfaces/contextmenuextension.h>
 #include <interfaces/idocumentcontroller.h>
+#include <interfaces/iselectioncontroller.h>
+#include <interfaces/iprojectcontroller.h>
 #include <project/projectmodel.h>
 #include <util/path.h>
 
 #include <KActionCollection>
 #include <KConfigGroup>
 #include <KLocalizedString>
 #include <KPluginFactory>
 
 #include <QAction>
 #include <QApplication>
 #include <QDir>
 #include <QIcon>
 
 using namespace KDevelop;
 
 K_PLUGIN_FACTORY_WITH_JSON(FileTemplatesFactory, "kdevfiletemplates.json", registerPlugin<FileTemplatesPlugin>();)
 
 class TemplatePreviewFactory : public KDevelop::IToolViewFactory
 {
 public:
     explicit TemplatePreviewFactory(FileTemplatesPlugin* plugin)
     : KDevelop::IToolViewFactory()
     , m_plugin(plugin)
     {
 
     }
 
     QWidget* create(QWidget* parent = nullptr) override
     {
         return new TemplatePreviewToolView(m_plugin, parent);
     }
 
     QString id() const override
     {
         return QStringLiteral("org.kdevelop.TemplateFilePreview");
     }
 
     Qt::DockWidgetArea defaultPosition() override
     {
         return Qt::RightDockWidgetArea;
     }
 
 private:
     FileTemplatesPlugin* m_plugin;
 };
 
 FileTemplatesPlugin::FileTemplatesPlugin(QObject* parent, const QVariantList& args)
     : IPlugin(QStringLiteral("kdevfiletemplates"), parent)
     , m_model(nullptr)
 {
     Q_UNUSED(args);
 
     setXMLFile(QStringLiteral("kdevfiletemplates.rc"));
     QAction* action = actionCollection()->addAction(QStringLiteral("new_from_template"));
     action->setText(i18n("New From Template..."));
     action->setIcon( QIcon::fromTheme( QStringLiteral("code-class") ) );
     action->setWhatsThis( i18n( "Allows you to create new source code files, such as classes or unit tests, using templates." ) );
     action->setStatusTip( i18n( "Create new files from a template" ) );
     connect (action, &QAction::triggered, this, &FileTemplatesPlugin::createFromTemplate);
 
     m_toolView = new TemplatePreviewFactory(this);
     core()->uiController()->addToolView(i18n("Template Preview"), m_toolView);
 }
 
 FileTemplatesPlugin::~FileTemplatesPlugin()
 {
 
 }
 
 void FileTemplatesPlugin::unload()
 {
     core()->uiController()->removeToolView(m_toolView);
 }
 
 ContextMenuExtension FileTemplatesPlugin::contextMenuExtension (Context* context)
 {
     ContextMenuExtension ext;
     QUrl fileUrl;
 
     if (context->type() == Context::ProjectItemContext)
     {
         ProjectItemContext* projectContext = dynamic_cast<ProjectItemContext*>(context);
         QList<ProjectBaseItem*> items = projectContext->items();
         if (items.size() != 1)
         {
             return ext;
         }
 
         QUrl url;
         ProjectBaseItem* item = items.first();
         if (item->folder())
         {
             url = item->path().toUrl();
         }
         else if (item->target())
         {
             url = item->parent()->path().toUrl();
         }
         if (url.isValid())
         {
             QAction* action = new QAction(i18n("Create From Template..."), this);
             action->setIcon(QIcon::fromTheme(QStringLiteral("code-class")));
             action->setData(url);
             connect(action, &QAction::triggered, this, &FileTemplatesPlugin::createFromTemplate);
             ext.addAction(ContextMenuExtension::FileGroup, action);
         }
 
         if (item->file())
         {
             fileUrl = item->path().toUrl();
         }
     }
     else if (context->type() == Context::EditorContext)
     {
         KDevelop::EditorContext* editorContext = dynamic_cast<KDevelop::EditorContext*>(context);
         fileUrl = editorContext->url();
     }
 
     if (fileUrl.isValid() && determineTemplateType(fileUrl) != NoTemplate)
     {
         QAction* action = new QAction(i18n("Show Template Preview"), this);
         action->setIcon(QIcon::fromTheme(QStringLiteral("document-preview")));
         action->setData(fileUrl);
         connect(action, &QAction::triggered, this, &FileTemplatesPlugin::previewTemplate);
         ext.addAction(ContextMenuExtension::ExtensionGroup, action);
     }
 
     return ext;
 }
 
 QString FileTemplatesPlugin::name() const
 {
     return i18n("File Templates");
 }
 
 QIcon FileTemplatesPlugin::icon() const
 {
     return QIcon::fromTheme(QStringLiteral("code-class"));
 }
 
 QAbstractItemModel* FileTemplatesPlugin::templatesModel()
 {
     if(!m_model) {
         m_model = new TemplatesModel(QStringLiteral("kdevfiletemplates"), this);
     }
     return m_model;
 }
 
 QString FileTemplatesPlugin::knsConfigurationFile() const
 {
     return QStringLiteral("kdevfiletemplates.knsrc");
 }
 
 QStringList FileTemplatesPlugin::supportedMimeTypes() const
 {
     QStringList types;
     types << QStringLiteral("application/x-desktop");
     types << QStringLiteral("application/x-bzip-compressed-tar");
     types << QStringLiteral("application/zip");
     return types;
 }
 
 void FileTemplatesPlugin::reload()
 {
     templatesModel();
     m_model->refresh();
 }
 
 void FileTemplatesPlugin::loadTemplate(const QString& fileName)
 {
     templatesModel();
     m_model->loadTemplateFile(fileName);
 }
 
 void FileTemplatesPlugin::createFromTemplate()
 {
     QUrl baseUrl;
     if (QAction* action = qobject_cast<QAction*>(sender()))
     {
         baseUrl = action->data().toUrl();
     }
     if (!baseUrl.isValid()) {
         // fall-back to currently active document's parent directory
         IDocument* doc = ICore::self()->documentController()->activeDocument();
         if (doc && doc->url().isValid()) {
             baseUrl = doc->url().adjusted(QUrl::RemoveFilename);
         }
     }
+    if (!baseUrl.isValid()) {
+        // fall-back to currently selected project's or item's base directory
+        ProjectItemContext* projectContext = dynamic_cast<ProjectItemContext*>(ICore::self()->selectionController()->currentSelection());
+        if (projectContext) {
+            const QList<ProjectBaseItem*> items = projectContext->items();
+            if (items.size() == 1) {
+                ProjectBaseItem* item = items.at(0);
+                if (item->folder()) {
+                    baseUrl = item->path().toUrl();
+                } else if (item->target()) {
+                    baseUrl = item->parent()->path().toUrl();
+                }
+            }
+        }
+    }
+    if (!baseUrl.isValid()) {
+        // fall back to base directory of currently open project, if there is only one
+        const QList<IProject*> projects = ICore::self()->projectController()->projects();
+        if (projects.size() == 1) {
+            baseUrl = projects.at(0)->path().toUrl();
+        }
+    }
+    if (!baseUrl.isValid()) {
+        // last resort: home path
+        baseUrl = QUrl::fromLocalFile(QDir::homePath());
+    }
     TemplateClassAssistant* assistant = new TemplateClassAssistant(QApplication::activeWindow(), baseUrl);
     assistant->setAttribute(Qt::WA_DeleteOnClose);
     assistant->show();
 }
 
 FileTemplatesPlugin::TemplateType FileTemplatesPlugin::determineTemplateType(const QUrl& url)
 {
     QDir dir(url.toLocalFile());
 
     /*
      * Search for a description file in the url's directory.
      * If it is not found there, try cascading up a maximum of 5 directories.
      */
     int level = 0;
     while (dir.cdUp() && level < 5)
     {
         QStringList filters;
         filters << QStringLiteral("*.kdevtemplate") << QStringLiteral("*.desktop");
         foreach (const QString& entry, dir.entryList(filters))
         {
             qCDebug(PLUGIN_FILETEMPLATES) << "Trying entry" << entry;
             /*
             * This logic is not perfect, but it works for most cases.
             *
             * Project template description files usually have the suffix
             * ".kdevtemplate", so those are easy to find. For project templates,
             * all the files in the directory are template files.
             *
             * On the other hand, file templates use the generic suffix ".desktop".
             * Fortunately, those explicitly list input and output files, so we
             * only match the explicitly listed files
             */
             if (entry.endsWith(QLatin1String(".kdevtemplate")))
             {
                 return ProjectTemplate;
             }
 
             KConfig* config = new KConfig(dir.absoluteFilePath(entry), KConfig::SimpleConfig);
             KConfigGroup group = config->group("General");
 
             qCDebug(PLUGIN_FILETEMPLATES) << "General group keys:" << group.keyList();
 
             if (!group.hasKey("Name") || !group.hasKey("Category"))
             {
                 continue;
             }
 
             if (group.hasKey("Files"))
             {
                 qCDebug(PLUGIN_FILETEMPLATES) << "Group has files " << group.readEntry("Files", QStringList());
                 foreach (const QString& outputFile, group.readEntry("Files", QStringList()))
                 {
                     if (dir.absoluteFilePath(config->group(outputFile).readEntry("File")) == url.toLocalFile())
                     {
                         return FileTemplate;
                     }
                 }
             }
 
             if (group.hasKey("ShowFilesAfterGeneration"))
             {
                 return ProjectTemplate;
             }
         }
 
         ++level;
     }
 
     return NoTemplate;
 }
 
 void FileTemplatesPlugin::previewTemplate()
 {
     QAction* action = qobject_cast<QAction*>(sender());
     if (!action || !action->data().toUrl().isValid())
     {
         return;
     }
     TemplatePreviewToolView* preview = qobject_cast<TemplatePreviewToolView*>(core()->uiController()->findToolView(i18n("Template Preview"), m_toolView));
     if (!preview)
     {
         return;
     }
 
     core()->documentController()->activateDocument(core()->documentController()->openDocument(action->data().toUrl()));
 }
 
 #include "filetemplatesplugin.moc"
diff --git a/plugins/filetemplates/ui/newclass.ui b/plugins/filetemplates/ui/newclass.ui
index c0d921034..2b5b7129b 100644
--- a/plugins/filetemplates/ui/newclass.ui
+++ b/plugins/filetemplates/ui/newclass.ui
@@ -1,84 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>NewClassDialog</class>
  <widget class="QWidget" name="NewClassDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>555</width>
     <height>488</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Identify the class and any classes from which it is to inherit.</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="identifierLabel">
         <property name="text">
          <string>&amp;Identifier:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buddy">
          <cstring>identifierLineEdit</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="inheritanceLabel">
         <property name="text">
          <string>In&amp;heritance:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <spacer name="verticalSpacer">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="0" column="1">
           <widget class="QLineEdit" name="identifierLineEdit"/>
       </item>
       <item row="1" column="1" rowspan="2">
        <widget class="KEditListWidget" name="keditlistwidget"/>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KEditListWidget</class>
    <extends>QWidget</extends>
    <header>keditlistwidget.h</header>
   </customwidget>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>identifierLineEdit</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filetemplates/ui/testcases.ui b/plugins/filetemplates/ui/testcases.ui
index 8bbd61fbe..b657d062b 100644
--- a/plugins/filetemplates/ui/testcases.ui
+++ b/plugins/filetemplates/ui/testcases.ui
@@ -1,93 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>TestCasesPage</class>
  <widget class="QWidget" name="TestCasesPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>555</width>
     <height>488</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Set the test name and its test cases.</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="2" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QLabel" name="identifierLabel">
           <property name="text">
            <string>&amp;Identifier:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="buddy">
            <cstring>identifierLineEdit</cstring>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="5" column="0">
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
          <widget class="QLabel" name="testCasesLabel">
           <property name="text">
            <string>&amp;Test Cases:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="6" column="0">
        <spacer name="verticalSpacer">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="4" column="1" rowspan="3">
        <widget class="KEditListWidget" name="keditlistwidget"/>
       </item>
       <item row="2" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QLineEdit" name="identifierLineEdit"/>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KEditListWidget</class>
    <extends>QWidget</extends>
    <header>keditlistwidget.h</header>
   </customwidget>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/patchreview/localpatchwidget.ui b/plugins/patchreview/localpatchwidget.ui
index c3171de33..0b4c6c05e 100644
--- a/plugins/patchreview/localpatchwidget.ui
+++ b/plugins/patchreview/localpatchwidget.ui
@@ -1,99 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>LocalPatchWidget</class>
  <widget class="QWidget" name="LocalPatchWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>300</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="localPatchOptions">
      <property name="title">
       <string>Patch</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::ExpandingFieldsGrow</enum>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Base:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KUrlRequester" name="baseDir">
         <property name="placeholderText">
          <string>Patch base...</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" colspan="2">
        <widget class="QTabWidget" name="tabWidget">
         <property name="currentIndex">
          <number>1</number>
         </property>
         <widget class="QWidget" name="fileTab">
          <attribute name="title">
           <string>From File</string>
          </attribute>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
            <widget class="KUrlRequester" name="filename">
             <property name="placeholderText">
              <string>Patch location...</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
         <widget class="QWidget" name="commandTab">
          <attribute name="title">
           <string>From Command</string>
          </attribute>
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QLineEdit" name="command">
             <property name="placeholderText">
              <string>Command's output...</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </widget>
       </item>
       <item row="2" column="0" colspan="2">
        <widget class="QCheckBox" name="applied">
         <property name="toolTip">
          <string>Patch is already applied on local version</string>
         </property>
         <property name="text">
          <string>Already applied</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/problemreporter/problemhighlighter.cpp b/plugins/problemreporter/problemhighlighter.cpp
index 92ae52a2c..cce7d0822 100644
--- a/plugins/problemreporter/problemhighlighter.cpp
+++ b/plugins/problemreporter/problemhighlighter.cpp
@@ -1,231 +1,227 @@
 /*
  * KDevelop Problem Reporter
  *
  * Copyright 2008 Hamish Rodda <rodda@kde.org>
  * Copyright 2008-2009 David Nolden <david.nolden.kdevelop@art-master.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
  * Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "problemhighlighter.h"
 
 #include <KTextEditor/Document>
 #include <KTextEditor/MarkInterface>
 #include <ktexteditor/view.h>
 #include <ktexteditor/movinginterface.h>
 
 #include <serialization/indexedstring.h>
 #include <language/duchain/navigation/abstractnavigationwidget.h>
 #include <language/util/navigationtooltip.h>
 #include <interfaces/icore.h>
 #include <interfaces/ilanguagecontroller.h>
 #include <interfaces/icompletionsettings.h>
 #include <language/duchain/duchainlock.h>
 #include <language/duchain/duchainutils.h>
 #include <language/duchain/topducontext.h>
 #include <language/duchain/navigation/problemnavigationcontext.h>
 #include <util/texteditorhelpers.h>
 
 #include <kcolorscheme.h>
 
 #include <shell/problem.h>
 
 using namespace KTextEditor;
 using namespace KDevelop;
 
 namespace
 {
 
 QColor colorForSeverity(IProblem::Severity severity)
 {
     KColorScheme scheme(QPalette::Active);
     switch (severity) {
     case IProblem::Error:
         return scheme.foreground(KColorScheme::NegativeText).color();
     case IProblem::Warning:
         return scheme.foreground(KColorScheme::NeutralText).color();
     case IProblem::Hint:
     default:
         return scheme.foreground(KColorScheme::PositiveText).color();
     }
 }
 }
 
 ProblemHighlighter::ProblemHighlighter(KTextEditor::Document* document)
     : m_document(document)
 {
     Q_ASSERT(m_document);
 
     connect(ICore::self()->languageController()->completionSettings(), &ICompletionSettings::settingsChanged, this,
             &ProblemHighlighter::settingsChanged);
     connect(m_document.data(), &Document::aboutToReload, this, &ProblemHighlighter::clearProblems);
     if (qobject_cast<MovingInterface*>(m_document)) {
         // can't use new signal/slot syntax here, MovingInterface is not a QObject
         connect(m_document, SIGNAL(aboutToInvalidateMovingInterfaceContent(KTextEditor::Document*)), this,
                 SLOT(clearProblems()));
     }
     connect(m_document, SIGNAL(aboutToRemoveText(KTextEditor::Range)), this,
             SLOT(aboutToRemoveText(KTextEditor::Range)));
 }
 
 void ProblemHighlighter::settingsChanged()
 {
     // Re-highlight
     setProblems(m_problems);
 }
 
 ProblemHighlighter::~ProblemHighlighter()
 {
     if (m_topHLRanges.isEmpty() || !m_document)
         return;
 
     qDeleteAll(m_topHLRanges);
 }
 
 void ProblemHighlighter::setProblems(const QVector<IProblem::Ptr>& problems)
 {
     if (!m_document)
         return;
 
     if (m_problems == problems)
         return;
 
     const bool hadProblems = !m_problems.isEmpty();
     m_problems = problems;
 
     qDeleteAll(m_topHLRanges);
     m_topHLRanges.clear();
-    m_problemsForRanges.clear();
 
     IndexedString url(m_document->url());
 
     /// TODO: create a better MarkInterface that makes it possible to add the marks to the scrollbar
     ///      but having no background.
     ///      also make it nicer together with other plugins, this would currently fail with
     ///      this method...
     const uint errorMarkType = KTextEditor::MarkInterface::Error;
     const uint warningMarkType = KTextEditor::MarkInterface::Warning;
     KTextEditor::MarkInterface* markIface = dynamic_cast<KTextEditor::MarkInterface*>(m_document.data());
     if (markIface && hadProblems) {
         // clear previously added marks
         foreach (KTextEditor::Mark* mark, markIface->marks()) {
             if (mark->type == errorMarkType || mark->type == warningMarkType) {
                 markIface->removeMark(mark->line, mark->type);
             }
         }
     }
 
     if (problems.isEmpty()) {
         return;
     }
 
     DUChainReadLocker lock;
 
     TopDUContext* top = DUChainUtils::standardContextForUrl(m_document->url());
 
     KTextEditor::MovingInterface* iface = dynamic_cast<KTextEditor::MovingInterface*>(m_document.data());
     Q_ASSERT(iface);
 
     foreach (const IProblem::Ptr& problem, problems) {
         if (problem->finalLocation().document != url || !problem->finalLocation().isValid())
             continue;
 
         KTextEditor::Range range;
         if (top)
             range = top->transformFromLocalRevision(RangeInRevision::castFromSimpleRange(problem->finalLocation()));
         else
             range = problem->finalLocation();
 
         // Fix problem's location range if necessary
         if (problem->finalLocationMode() != IProblem::Range && range.onSingleLine()) {
             int line = range.start().line();
             const QString lineString = m_document->line(line);
 
             int startColumn = 0;
             int endColumn = lineString.length() - 1;
 
             if (problem->finalLocationMode() == IProblem::TrimmedLine) {
                 while (lineString.at(startColumn++).isSpace()) {}
                 --startColumn;
 
                 while (lineString.at(endColumn--).isSpace()) {}
                 ++endColumn;
             }
 
             range.setStart(Cursor(line, startColumn));
             range.setEnd(Cursor(line, endColumn));
 
             problem->setFinalLocation(DocumentRange(problem->finalLocation().document, range));
             problem->setFinalLocationMode(IProblem::Range);
         }
 
         if (range.end().line() >= m_document->lines())
             range.end() = KTextEditor::Cursor(m_document->endOfLine(m_document->lines() - 1));
 
         if (range.isEmpty()) {
             range.setEnd(range.end() + KTextEditor::Cursor(0, 1));
         }
 
         KTextEditor::MovingRange* problemRange = iface->newMovingRange(range);
-
-        m_problemsForRanges.insert(problemRange, problem);
         m_topHLRanges.append(problemRange);
 
         if (problem->source() != IProblem::ToDo
             && (problem->severity() != IProblem::Hint
                 || ICore::self()->languageController()->completionSettings()->highlightSemanticProblems())) {
             KTextEditor::Attribute::Ptr attribute(new KTextEditor::Attribute());
             attribute->setUnderlineStyle(QTextCharFormat::WaveUnderline);
             attribute->setUnderlineColor(colorForSeverity(problem->severity()));
             problemRange->setAttribute(attribute);
         }
 
         if (markIface && ICore::self()->languageController()->completionSettings()->highlightProblematicLines()) {
             uint mark;
             if (problem->severity() == IProblem::Error) {
                 mark = errorMarkType;
             } else if (problem->severity() == IProblem::Warning) {
                 mark = warningMarkType;
             } else {
                 continue;
             }
             markIface->addMark(problem->finalLocation().start().line(), mark);
         }
     }
 }
 
 void ProblemHighlighter::aboutToRemoveText(const KTextEditor::Range& range)
 {
     if (range.onSingleLine()) { // no need to optimize this
         return;
     }
 
     QList<MovingRange*>::iterator it = m_topHLRanges.begin();
     while (it != m_topHLRanges.end()) {
         if (range.contains((*it)->toRange())) {
-            m_problemsForRanges.remove(*it);
             delete (*it);
             it = m_topHLRanges.erase(it);
         } else {
             ++it;
         }
     }
 }
 
 void ProblemHighlighter::clearProblems()
 {
     setProblems({});
 }
diff --git a/plugins/problemreporter/problemhighlighter.h b/plugins/problemreporter/problemhighlighter.h
index 6026818b6..97dde7a2e 100644
--- a/plugins/problemreporter/problemhighlighter.h
+++ b/plugins/problemreporter/problemhighlighter.h
@@ -1,54 +1,53 @@
 /*
  * KDevelop Problem Reporter
  *
  * Copyright 2008 Hamish Rodda <rodda@kde.org>
  * Copyright 2008-2009 David Nolden <david.nolden.kdevelop@art-master.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
  * Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef KDEVPLATFORM_PLUGIN_PROBLEM_HIGHLIGHT_H
 #define KDEVPLATFORM_PLUGIN_PROBLEM_HIGHLIGHT_H
 
 #include <language/duchain/problem.h>
 #include <qpointer.h>
 #include <ktexteditor/movingrange.h>
 #include <interfaces/iproblem.h>
 
 class ProblemHighlighter : public QObject
 {
     Q_OBJECT
 public:
     explicit ProblemHighlighter(KTextEditor::Document* document);
     ~ProblemHighlighter() override;
 
     void setProblems(const QVector<KDevelop::IProblem::Ptr>& problems);
 
 private slots:
     void aboutToRemoveText(const KTextEditor::Range& range);
     void clearProblems();
 
 private:
     QPointer<KTextEditor::Document> m_document;
     QList<KTextEditor::MovingRange*> m_topHLRanges;
     QVector<KDevelop::IProblem::Ptr> m_problems;
-    QMap<KTextEditor::MovingRange*, KDevelop::IProblem::Ptr> m_problemsForRanges;
 
 public slots:
     void settingsChanged();
 };
 
 #endif // KDEVPLATFORM_PLUGIN_PROBLEM_HIGHLIGHT_H
diff --git a/plugins/subversion/ui/catoptiondlg.ui b/plugins/subversion/ui/catoptiondlg.ui
index 862202d05..e1208fdd2 100644
--- a/plugins/subversion/ui/catoptiondlg.ui
+++ b/plugins/subversion/ui/catoptiondlg.ui
@@ -1,69 +1,69 @@
 <ui version="4.0" >
  <class>SvnCatOptionDlg</class>
  <widget class="QWidget" name="SvnCatOptionDlg" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>294</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QLabel" name="label" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string comment="KDE::DoNotExtract" >TextLabel</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="KUrlRequester" name="urledit" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QLabel" name="label_2" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string comment="KDE::DoNotExtract" >TextLabel</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="SvnRevisionWidget" native="1" name="revisionWidget" />
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
   <customwidget>
    <class>SvnRevisionWidget</class>
    <extends>QWidget</extends>
    <header>svnrevisionwidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/subversion/ui/checkoutmetadatawidget.ui b/plugins/subversion/ui/checkoutmetadatawidget.ui
index ae2be92a7..6abe0797a 100644
--- a/plugins/subversion/ui/checkoutmetadatawidget.ui
+++ b/plugins/subversion/ui/checkoutmetadatawidget.ui
@@ -1,61 +1,61 @@
 <ui version="4.0" >
  <class>SvnCheckoutMetadataWidget</class>
  <widget class="QWidget" name="SvnCheckoutMetadataWidget" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>393</width>
     <height>105</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Checkout</string>
   </property>
   <layout class="QGridLayout" >
    <item row="0" column="0" >
     <widget class="QLabel" name="label" >
      <property name="text" >
       <string>Repository Url:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1" >
     <widget class="KUrlRequester" name="src" />
    </item>
    <item row="1" column="0" >
     <widget class="QLabel" name="label_2" >
      <property name="text" >
       <string>Destination Path:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1" >
     <widget class="KUrlRequester" name="dest" />
    </item>
    <item row="2" column="0" >
     <widget class="QLabel" name="label_3" >
      <property name="text" >
       <string>Recursive:</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1" >
     <widget class="QCheckBox" name="recurse" >
      <property name="text" >
       <string/>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/subversion/ui/copyoptiondlg.ui b/plugins/subversion/ui/copyoptiondlg.ui
index d9867bc93..22f40ef24 100644
--- a/plugins/subversion/ui/copyoptiondlg.ui
+++ b/plugins/subversion/ui/copyoptiondlg.ui
@@ -1,121 +1,116 @@
 <ui version="4.0" >
  <class>SvnCopyOptionDlg</class>
  <widget class="QWidget" name="SvnCopyOptionDlg" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>444</width>
     <height>469</height>
    </rect>
   </property>
   <layout class="QGridLayout" >
    <item row="0" column="0" >
     <widget class="QLabel" name="label" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string>Requested local path:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0" >
     <widget class="QLineEdit" name="reqEdit" >
      <property name="text" >
       <string/>
      </property>
      <property name="readOnly" >
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="0" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>Source</string>
      </property>
      <layout class="QVBoxLayout" >
       <item>
        <widget class="QRadioButton" name="urlRadio" >
         <property name="text" >
          <string>Specify by repository URL</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="pathRadio" >
         <property name="text" >
          <string>Specify by local working copy</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLineEdit" name="srcEdit" />
       </item>
      </layout>
     </widget>
    </item>
    <item row="3" column="0" >
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
       <string>Source revision</string>
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
        <widget class="SvnRevisionWidget" native="1" name="revisionWidget" />
       </item>
      </layout>
     </widget>
    </item>
    <item row="4" column="0" >
     <widget class="QGroupBox" name="groupBox_3" >
      <property name="title" >
       <string>Destination</string>
      </property>
      <layout class="QVBoxLayout" >
       <item>
        <widget class="QLabel" name="label_2" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="text" >
          <string>Specify either the full repository URL or local working path</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="KUrlRequester" name="destEdit" />
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
   <customwidget>
    <class>SvnRevisionWidget</class>
    <extends>QWidget</extends>
    <header>svnrevisionwidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/subversion/ui/diffoptiondlg.ui b/plugins/subversion/ui/diffoptiondlg.ui
index 914b030af..33eccad55 100644
--- a/plugins/subversion/ui/diffoptiondlg.ui
+++ b/plugins/subversion/ui/diffoptiondlg.ui
@@ -1,79 +1,72 @@
 <ui version="4.0" >
  <class>SvnPegDiffDialogWidget</class>
  <widget class="QWidget" name="SvnPegDiffDialogWidget" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>431</width>
     <height>328</height>
    </rect>
   </property>
   <layout class="QGridLayout" >
    <item row="0" column="0" >
     <widget class="QLabel" name="label" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string>Target Url</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0" >
     <widget class="QLineEdit" name="urlEdit" >
      <property name="readOnly" >
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="0" >
     <widget class="QGroupBox" name="startRevWidget" >
      <property name="title" >
       <string>Start Revision</string>
      </property>
     </widget>
    </item>
    <item row="3" column="0" >
     <widget class="QGroupBox" name="endRevWidget" >
      <property name="title" >
       <string>End Revision</string>
      </property>
     </widget>
    </item>
    <item row="4" column="0" >
     <widget class="QCheckBox" name="nonrecurseChk" >
      <property name="text" >
       <string>Non Recursive</string>
      </property>
     </widget>
    </item>
    <item row="5" column="0" >
     <widget class="QCheckBox" name="nodiffDeletedChk" >
      <property name="text" >
       <string>No diff deleted</string>
      </property>
     </widget>
    </item>
    <item row="6" column="0" >
     <widget class="QCheckBox" name="ignoreContentsChk" >
      <property name="text" >
       <string>Ignore contents type</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/subversion/ui/importmetadatawidget.ui b/plugins/subversion/ui/importmetadatawidget.ui
index 60f5b9ce9..bfb3772a7 100644
--- a/plugins/subversion/ui/importmetadatawidget.ui
+++ b/plugins/subversion/ui/importmetadatawidget.ui
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SvnImportMetadataWidget</class>
  <widget class="QWidget" name="SvnImportMetadataWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>549</width>
     <height>280</height>
    </rect>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="labelForSrc">
      <property name="text">
       <string>Source directory:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Repository:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QLineEdit" name="dest">
      <property name="toolTip">
       <string>Repository Location</string>
      </property>
      <property name="statusTip">
       <string>Repository Location to import into</string>
      </property>
      <property name="whatsThis">
       <string>Choose the repository into which the source directory is imported</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KUrlRequester" name="srcEdit"/>
    </item>
    <item row="2" column="1">
     <widget class="KTextEdit" name="message"/>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Commit Message:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
   <customwidget>
    <class>KTextEdit</class>
    <extends>QTextEdit</extends>
    <header>ktextedit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/subversion/ui/moveoptiondlg.ui b/plugins/subversion/ui/moveoptiondlg.ui
index cfd3363b2..58146dd0f 100644
--- a/plugins/subversion/ui/moveoptiondlg.ui
+++ b/plugins/subversion/ui/moveoptiondlg.ui
@@ -1,110 +1,105 @@
 <ui version="4.0" >
  <class>SvnMoveOptionDlg</class>
  <widget class="QWidget" name="SvnMoveOptionDlg" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>469</width>
     <height>339</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QLabel" name="label_3" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string>Requested local path:</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QLineEdit" name="reqEdit" >
      <property name="text" >
       <string/>
      </property>
      <property name="readOnly" >
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_4" >
      <property name="title" >
       <string>Source</string>
      </property>
      <layout class="QVBoxLayout" >
       <item>
        <widget class="QRadioButton" name="urlRadio" >
         <property name="text" >
          <string>Specify by repository URL</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="pathRadio" >
         <property name="text" >
          <string>Specify by local working copy</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLineEdit" name="srcEdit" />
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_3" >
      <property name="title" >
       <string>Destination</string>
      </property>
      <layout class="QVBoxLayout" >
       <item>
        <widget class="QLabel" name="label_2" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="text" >
          <string>Specify either the full repository URL or local working path</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="KUrlRequester" name="destEdit" />
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QCheckBox" name="forceChk" >
      <property name="text" >
       <string>Forcefully delete locally modified and/or unversioned items</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/subversion/ui/statusoptiondlg.ui b/plugins/subversion/ui/statusoptiondlg.ui
index 3111a6152..9adc21356 100644
--- a/plugins/subversion/ui/statusoptiondlg.ui
+++ b/plugins/subversion/ui/statusoptiondlg.ui
@@ -1,106 +1,101 @@
 <ui version="4.0" >
  <class>SvnStatusOptionDlg</class>
  <widget class="QWidget" name="SvnStatusOptionDlg" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>474</width>
     <height>415</height>
    </rect>
   </property>
   <layout class="QGridLayout" >
    <item row="0" column="0" >
     <widget class="QLabel" name="label" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string>Status Requested for:</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0" >
     <widget class="QLineEdit" name="urledit" >
      <property name="readOnly" >
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="0" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>Specify revision</string>
      </property>
      <layout class="QVBoxLayout" >
       <item>
        <widget class="SvnRevisionWidget" native="1" name="revisionWidget" />
       </item>
      </layout>
     </widget>
    </item>
    <item row="3" column="0" >
     <widget class="QCheckBox" name="nonrecurse" >
      <property name="text" >
       <string>Non recursive</string>
      </property>
     </widget>
    </item>
    <item row="4" column="0" >
     <widget class="QCheckBox" name="onlyInterests" >
      <property name="text" >
       <string>Retrieve only "interesting" entries (such as local modifications)</string>
      </property>
      <property name="checked" >
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="5" column="0" >
     <widget class="QCheckBox" name="contactRepChk" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text" >
       <string>Contact repository and augment with repository information</string>
      </property>
     </widget>
    </item>
    <item row="6" column="0" >
     <widget class="QCheckBox" name="noignore" >
      <property name="text" >
       <string>Do not ignore svn:ignore</string>
      </property>
     </widget>
    </item>
    <item row="7" column="0" >
     <widget class="QCheckBox" name="ignoreExternalsChk" >
      <property name="text" >
       <string>Ignore external items</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>SvnRevisionWidget</class>
    <extends>QWidget</extends>
    <header>svnrevisionwidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/shell/projectsourcepage.ui b/shell/projectsourcepage.ui
index 79699aa5b..819cd6116 100644
--- a/shell/projectsourcepage.ui
+++ b/shell/projectsourcepage.ui
@@ -1,133 +1,133 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ProjectSourcePage</class>
  <widget class="QWidget" name="ProjectSourcePage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>420</width>
     <height>353</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="QLabel" name="label_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Source:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QComboBox" name="sources"/>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Destination</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Directory:</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="KUrlRequester" name="workingDir">
         <property name="placeholderText" stdset="0">
          <string>Select the directory to use...</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="sourceBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
       <string>Source</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QWidget" name="remoteWidget" native="true"/>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QPushButton" name="get">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="text">
            <string>Get</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QProgressBar" name="creationProgress">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="value">
            <number>0</number>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <widget class="KMessageWidget" name="status"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <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>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>
    <header location="global">kmessagewidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/shell/settings/projectpreferences.ui b/shell/settings/projectpreferences.ui
index f93ed69ed..126d8fb8b 100644
--- a/shell/settings/projectpreferences.ui
+++ b/shell/settings/projectpreferences.ui
@@ -1,88 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ProjectPreferences</class>
  <widget class="QWidget" name="ProjectSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>597</width>
     <height>247</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="QLabel" name="label_3">
        <property name="toolTip">
         <string>Select the base directory where new projects are to be created.</string>
        </property>
        <property name="text">
         <string>Projects base directory:</string>
        </property>
        <property name="buddy">
         <cstring>kcfg_projectsBaseDirectory</cstring>
        </property>
       </widget>
      </item>
      <item>
       <widget class="KUrlRequester" name="kcfg_projectsBaseDirectory">
        <property name="toolTip">
         <string>Select the base directory where new projects are to be created.</string>
        </property>
        <property name="mode">
         <set>KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QCheckBox" name="kcfg_parseAllProjectSources">
      <property name="toolTip">
       <string>Parse all files in a project after the project has been opened.</string>
      </property>
      <property name="text">
       <string>Schedule all project files for parsing</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QCheckBox" name="kcfg_saveDocuments">
      <property name="toolTip">
       <string>Save all modified documents when the &quot;build&quot; action is triggered.</string>
      </property>
      <property name="text">
       <string>Save all documents before building</string>
      </property>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>403</width>
        <height>147</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/sublime/idealbuttonbarwidget.cpp b/sublime/idealbuttonbarwidget.cpp
index 6a630c36d..39e839577 100644
--- a/sublime/idealbuttonbarwidget.cpp
+++ b/sublime/idealbuttonbarwidget.cpp
@@ -1,383 +1,354 @@
 /*
   Copyright 2007 Roberto Raggi <roberto@kdevelop.org>
   Copyright 2007 Hamish Rodda <rodda@kde.org>
   Copyright 2011 Alexander Dymo <adymo@kdevelop.org>
 
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
   the above copyright notice appear in all copies and that both that
   copyright notice and this permission notice appear in supporting
   documentation.
 
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
   AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "idealbuttonbarwidget.h"
 #include "mainwindow.h"
 #include "idealdockwidget.h"
 #include "ideallayout.h"
 #include "idealtoolbutton.h"
 #include "document.h"
 #include "view.h"
 
 #include <KLocalizedString>
 #include <KSharedConfig>
 #include <KConfigGroup>
 
 #include <QBoxLayout>
 #include <QApplication>
 
 using namespace Sublime;
 
 class ToolViewAction : public QAction
 {
 public:
     ToolViewAction(IdealDockWidget *dock, QObject* parent) : QAction(parent), m_dock(dock)
     {
         setCheckable(true);
 
         const QString title = dock->view()->document()->title();
         setIcon(dock->windowIcon());
         setToolTip(i18n("Toggle '%1' tool view.", title));
         setText(title);
 
         //restore toolview shortcut config
         KConfigGroup config = KSharedConfig::openConfig()->group("UI");
         QStringList shortcutStrings = config.readEntry(QStringLiteral("Shortcut for %1").arg(title), QStringList());
         setShortcuts({ QKeySequence::fromString(shortcutStrings.value(0)), QKeySequence::fromString(shortcutStrings.value(1)) });
 
         dock->setWindowTitle(title);
         dock->view()->widget()->installEventFilter(this);
         refreshText();
     }
 
     IdealDockWidget *dockWidget() const
     {
         Q_ASSERT(m_dock);
         return m_dock;
     }
 
     IdealToolButton* button() { return m_button; }
     void setButton(IdealToolButton* button) {
         m_button = button;
         refreshText();
     }
 
     QString id() {
         return m_dock->view()->document()->documentSpecifier();
     }
 
 private:
     bool eventFilter(QObject * watched, QEvent * event) override
     {
         if (watched == m_dock->view()->widget() && event->type() == QEvent::EnabledChange) {
             refreshText();
         }
 
         return QObject::eventFilter(watched, event);
     }
 
     void refreshText()
     {
         const auto widget = m_dock->view()->widget();
         const QString title = m_dock->view()->document()->title();
         setText(widget->isEnabled() ? title : QStringLiteral("(%1)").arg(title));
     }
 
     QPointer<IdealDockWidget> m_dock;
     QPointer<IdealToolButton> m_button;
 };
 
 IdealButtonBarWidget::IdealButtonBarWidget(Qt::DockWidgetArea area,
         IdealController *controller, Sublime::MainWindow *parent)
     : QWidget(parent)
     , _area(area)
     , _controller(controller)
     , _corner(nullptr)
     , _showState(false)
 {
     setContextMenuPolicy(Qt::CustomContextMenu);
     setToolTip(i18nc("@info:tooltip", "Right click to add new tool views."));
 
     if (area == Qt::BottomDockWidgetArea)
     {
         QBoxLayout *statusLayout = new QBoxLayout(QBoxLayout::RightToLeft, this);
         statusLayout->setMargin(0);
         statusLayout->setSpacing(IDEAL_LAYOUT_SPACING);
         statusLayout->setContentsMargins(0, IDEAL_LAYOUT_MARGIN, 0, IDEAL_LAYOUT_MARGIN);
 
         IdealButtonBarLayout *l = new IdealButtonBarLayout(orientation());
         statusLayout->addLayout(l);
 
         _corner = new QWidget(this);
         QBoxLayout *cornerLayout = new QBoxLayout(QBoxLayout::LeftToRight, _corner);
         cornerLayout->setMargin(0);
         cornerLayout->setSpacing(0);
         statusLayout->addWidget(_corner);
         statusLayout->addStretch(1);
     }
     else
         (void) new IdealButtonBarLayout(orientation(), this);
 }
 
 QAction* IdealButtonBarWidget::addWidget(IdealDockWidget *dock,
                                          Area *area, View *view)
 {
     if (_area == Qt::BottomDockWidgetArea || _area == Qt::TopDockWidgetArea)
         dock->setFeatures( dock->features() | IdealDockWidget::DockWidgetVerticalTitleBar );
 
     dock->setArea(area);
     dock->setView(view);
     dock->setDockWidgetArea(_area);
 
     auto action = new ToolViewAction(dock, this);
     addAction(action);
 
     return action;
 }
 
 QWidget* IdealButtonBarWidget::corner()
 {
     return _corner;
 }
 
 void IdealButtonBarWidget::addAction(QAction* qaction)
 {
     QWidget::addAction(qaction);
 
     auto action = dynamic_cast<ToolViewAction*>(qaction);
     if (!action || action->button()) {
       return;
     }
 
     bool wasEmpty = isEmpty();
 
     IdealToolButton *button = new IdealToolButton(_area);
     //apol: here we set the usual width of a button for the vertical toolbars as the minimumWidth
     //this is done because otherwise when we remove all the buttons and re-add new ones we get all
     //the screen flickering. This is solved by not defaulting to a smaller width when it's empty
     int w = button->sizeHint().width();
     if (orientation() == Qt::Vertical && w > minimumWidth()) {
         setMinimumWidth(w);
     }
 
     action->setButton(button);
     button->setDefaultAction(action);
 
     Q_ASSERT(action->dockWidget());
 
     connect(action, &QAction::toggled, this, static_cast<void(IdealButtonBarWidget::*)(bool)>(&IdealButtonBarWidget::showWidget));
-    connect(button, &IdealToolButton::clicked, this, &IdealButtonBarWidget::buttonPressed);
     connect(button, &IdealToolButton::customContextMenuRequested,
             action->dockWidget(), &IdealDockWidget::contextMenuRequested);
 
     addButtonToOrder(button);
     applyOrderToLayout();
 
     if (wasEmpty) {
         emit emptyChanged();
     }
 }
 
 void IdealButtonBarWidget::removeAction(QAction* widgetAction)
 {
     QWidget::removeAction(widgetAction);
 
     auto action = dynamic_cast<ToolViewAction*>(widgetAction);
     delete action->button();
     delete action;
 
     if (layout()->isEmpty()) {
         emit emptyChanged();
     }
 }
 
 bool IdealButtonBarWidget::isEmpty()
 {
     return actions().isEmpty();
 }
 
 bool IdealButtonBarWidget::isShown()
 {
     return std::any_of(actions().cbegin(), actions().cend(),
                        [](const QAction* action){ return action->isChecked(); });
 }
 
 void IdealButtonBarWidget::saveShowState()
 {
     _showState = isShown();
 }
 
 bool IdealButtonBarWidget::lastShowState()
 {
     return _showState;
 }
 
 QString IdealButtonBarWidget::id(const IdealToolButton* button) const
 {
     foreach (QAction* a, actions()) {
         auto tva = dynamic_cast<ToolViewAction*>(a);
         if (tva && tva->button() == button) {
             return tva->id();
         }
     }
 
     return QString();
 }
 
 IdealToolButton* IdealButtonBarWidget::button(const QString& id) const
 {
     foreach (QAction* a, actions()) {
         auto tva = dynamic_cast<ToolViewAction*>(a);
         if (tva && tva->id() == id) {
             return tva->button();
         }
     }
 
     return nullptr;
 }
 
 void IdealButtonBarWidget::addButtonToOrder(const IdealToolButton* button)
 {
     QString buttonId = id(button);
     if (!_buttonsOrder.contains(buttonId)) {
         if (_area == Qt::BottomDockWidgetArea) {
             _buttonsOrder.push_front(buttonId);
         }
         else {
             _buttonsOrder.push_back(buttonId);
         }
     }
 }
 
 void IdealButtonBarWidget::loadOrderSettings(const KConfigGroup& configGroup)
 {
     _buttonsOrder = configGroup.readEntry(QStringLiteral("(%1) Tool Views Order").arg(_area), QStringList());
     applyOrderToLayout();
 }
 
 void IdealButtonBarWidget::saveOrderSettings(KConfigGroup& configGroup)
 {
     takeOrderFromLayout();
     configGroup.writeEntry(QStringLiteral("(%1) Tool Views Order").arg(_area), _buttonsOrder);
 }
 
 void IdealButtonBarWidget::applyOrderToLayout()
 {
     // If widget already have some buttons in the layout then calling loadOrderSettings() may leads
     // to situations when loaded order does not contains all existing buttons. Therefore we should
     // fix this with using addToOrder() method.
     for (int i = 0; i < layout()->count(); ++i) {
         if (auto button = dynamic_cast<IdealToolButton*>(layout()->itemAt(i)->widget())) {
             addButtonToOrder(button);
             layout()->removeWidget(button);
         }
     }
 
     foreach(const QString& id, _buttonsOrder) {
         if (auto b = button(id)) {
             layout()->addWidget(b);
         }
     }
 }
 
 void IdealButtonBarWidget::takeOrderFromLayout()
 {
     _buttonsOrder.clear();
     for (int i = 0; i < layout()->count(); ++i) {
         if (auto button = dynamic_cast<IdealToolButton*>(layout()->itemAt(i)->widget())) {
             _buttonsOrder += id(button);
         }
     }
 }
 
 Qt::Orientation IdealButtonBarWidget::orientation() const
 {
     if (_area == Qt::LeftDockWidgetArea || _area == Qt::RightDockWidgetArea)
         return Qt::Vertical;
 
     return Qt::Horizontal;
 }
 
 Qt::DockWidgetArea IdealButtonBarWidget::area() const
 {
     return _area;
 }
 
 void IdealButtonBarWidget::showWidget(bool checked)
 {
     Q_ASSERT(parentWidget() != nullptr);
 
     QAction *action = qobject_cast<QAction *>(sender());
     Q_ASSERT(action);
 
     showWidget(action, checked);
 }
 
 void IdealButtonBarWidget::showWidget(QAction *action, bool checked)
 {
     auto widgetAction = dynamic_cast<ToolViewAction*>(action);
 
     IdealToolButton* button = widgetAction->button();
     Q_ASSERT(button);
 
     if (checked) {
-        IdealController::RaiseMode mode = IdealController::RaiseMode(widgetAction->property("raise").toInt());
-        if ( mode == IdealController::HideOtherViews ) {
+        if ( !QApplication::keyboardModifiers().testFlag(Qt::ControlModifier) ) {
             // Make sure only one widget is visible at any time.
             // The alternative to use a QActionCollection and setting that to "exclusive"
             // has a big drawback: QActions in a collection that is exclusive cannot
             // be un-checked by the user, e.g. in the View -> Tool Views menu.
             foreach(QAction *otherAction, actions()) {
                 if ( otherAction != widgetAction && otherAction->isChecked() )
                     otherAction->setChecked(false);
             }
         }
 
         _controller->lastDockWidget[_area] = widgetAction->dockWidget();
     }
 
     _controller->showDockWidget(widgetAction->dockWidget(), checked);
     widgetAction->setChecked(checked);
     button->setChecked(checked);
 }
 
 IdealDockWidget * IdealButtonBarWidget::widgetForAction(QAction *_action) const
 {
     return dynamic_cast<ToolViewAction *>(_action)->dockWidget();
 }
-
-void IdealButtonBarWidget::buttonPressed(bool state)
-{
-    auto button = qobject_cast<IdealToolButton*>(sender());
-    Q_ASSERT(button);
-    ToolViewAction* action = nullptr;
-    foreach(QAction* a, actions()) {
-        auto tva = dynamic_cast<ToolViewAction *>(a);
-        if (tva && tva->button() == button)
-            action = tva;
-    }
-    Q_ASSERT(action);
-
-    const bool forceGrouping = QApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
-
-    if (forceGrouping) {
-        action->setProperty("raise", IdealController::GroupWithOtherViews);
-    }
-
-    action->setChecked(state);
-
-    if (forceGrouping) {
-        // need to reset the raise property so that subsequent
-        // showWidget()'s will not do grouping unless explicitly asked
-        action->setProperty("raise", IdealController::HideOtherViews);
-    }
-}
diff --git a/sublime/idealbuttonbarwidget.h b/sublime/idealbuttonbarwidget.h
index aec5f1c9a..22a5ee2ab 100644
--- a/sublime/idealbuttonbarwidget.h
+++ b/sublime/idealbuttonbarwidget.h
@@ -1,101 +1,99 @@
 /*
   Copyright 2007 Roberto Raggi <roberto@kdevelop.org>
   Copyright 2007 Hamish Rodda <rodda@kde.org>
   Copyright 2011 Alexander Dymo <adymo@kdevelop.org>
 
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
   the above copyright notice appear in all copies and that both that
   copyright notice and this permission notice appear in supporting
   documentation.
 
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
   AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef IDEALBUTTONBARWIDGET_H
 #define IDEALBUTTONBARWIDGET_H
 
 #include <QWidget>
 #include <QHash>
 
 class IdealToolButton;
 class ToolViewAction;
 class QAction;
 
 class KConfigGroup;
 
 namespace Sublime
 {
 
 class MainWindow;
 class IdealController;
 class IdealDockWidget;
 class View;
 class Area;
 
 class IdealButtonBarWidget: public QWidget
 {
     Q_OBJECT
 
 public:
     IdealButtonBarWidget(Qt::DockWidgetArea area,
         IdealController *controller, Sublime::MainWindow *parent);
 
     QAction* addWidget(IdealDockWidget *widget,
                        Area* area, View *view);
 
     void addAction(QAction *action);
     void removeAction(QAction* action);
 
     Qt::Orientation orientation() const;
 
     Qt::DockWidgetArea area() const;
 
     IdealDockWidget* widgetForAction(QAction* action) const;
 
     QWidget* corner();
 
     void showWidget(QAction *widgetAction, bool checked);
     bool isEmpty();
 
     bool isShown();
     void saveShowState();
     bool lastShowState();
 
     void loadOrderSettings(const KConfigGroup& configGroup);
     void saveOrderSettings(KConfigGroup& configGroup);
 
-private Q_SLOTS:
-    void showWidget(bool checked);
-    void buttonPressed(bool state);
-
 signals:
     void emptyChanged();
 
 private:
+    void showWidget(bool checked);
+
     void applyOrderToLayout();
     void takeOrderFromLayout();
 
     IdealToolButton* button(const QString& id) const;
     QString id(const IdealToolButton* button) const;
 
     void addButtonToOrder(const IdealToolButton* button);
 
     Qt::DockWidgetArea _area;
     IdealController *_controller;
     QWidget *_corner;
     bool _showState;
     QStringList _buttonsOrder;
 };
 
 }
 
 #endif // IDEALBUTTONBARWIDGET_H
diff --git a/vcs/dvcs/ui/dvcsimportmetadatawidget.ui b/vcs/dvcs/ui/dvcsimportmetadatawidget.ui
index e700d902b..e5f122c47 100644
--- a/vcs/dvcs/ui/dvcsimportmetadatawidget.ui
+++ b/vcs/dvcs/ui/dvcsimportmetadatawidget.ui
@@ -1,38 +1,38 @@
 <ui version="4.0" >
  <class>DvcsImportMetadataWidget</class>
  <widget class="QWidget" name="DvcsImportMetadataWidget" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>581</width>
     <height>37</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Import</string>
   </property>
   <layout class="QGridLayout" >
    <item row="0" column="0" >
     <widget class="QLabel" name="labelUrl" >
      <property name="text" >
       <string>Source Directory:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1" >
     <widget class="KUrlRequester" name="sourceLoc" />
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>