diff --git a/documentation/qthelp/qthelpconfig.ui b/documentation/qthelp/qthelpconfig.ui
index 8886c97859..55017947ec 100644
--- a/documentation/qthelp/qthelpconfig.ui
+++ b/documentation/qthelp/qthelpconfig.ui
@@ -1,200 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QtHelpConfigUI</class>
  <widget class="QWidget" name="QtHelpConfigUI">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>560</width>
     <height>443</height>
    </rect>
   </property>
   <property name="locale">
    <locale language="English" country="UnitedStates"/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QGroupBox" name="boxAutoLoad">
      <property name="title">
       <string>Load QtHelp Documentation from System Locations</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="labelLoadQtApiDocs">
         <property name="text">
          <string>&amp;Load Qt API documentation:</string>
         </property>
         <property name="buddy">
          <cstring>loadQtDocsCheckBox</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QCheckBox" name="loadQtDocsCheckBox">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="labelLoadFromDirectory">
         <property name="text">
          <string>Load QtHelp files from directory:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="qchSearchDir" native="true"/>
       </item>
       <item row="2" column="0" colspan="2">
        <widget class="KMessageWidget" name="messageAvailabilityQtDocs" native="true">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="minimumSize">
          <size>
           <width>0</width>
           <height>0</height>
          </size>
         </property>
         <property name="text" stdset="0">
          <string/>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="boxQchManage">
      <property name="title">
       <string>Install Additional Documentation Files</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <property name="spacing">
            <number>1</number>
           </property>
           <property name="leftMargin">
            <number>0</number>
           </property>
           <item>
            <widget class="QTreeWidget" name="qchTable">
             <property name="editTriggers">
              <set>QAbstractItemView::NoEditTriggers</set>
             </property>
             <property name="rootIsDecorated">
              <bool>false</bool>
             </property>
             <property name="wordWrap">
              <bool>false</bool>
             </property>
             <property name="columnCount">
              <number>5</number>
             </property>
             <property name="showGrid" stdset="0">
              <bool>false</bool>
             </property>
             <attribute name="headerVisible">
              <bool>true</bool>
             </attribute>
             <column>
              <property name="text">
               <string>Name</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string>Path</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string notr="true">IconName</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string notr="true">Ghns</string>
              </property>
             </column>
             <column>
              <property name="text">
               <string notr="true"/>
              </property>
             </column>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="tableCtrlLayout">
             <item>
              <widget class="QPushButton" name="addButton">
               <property name="text">
                <string>Add</string>
               </property>
              </widget>
             </item>
             <item>
              <spacer name="horizontalSpacer">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
                 <height>20</height>
                </size>
               </property>
              </spacer>
             </item>
            </layout>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_3">
             <property name="topMargin">
              <number>0</number>
             </property>
            </layout>
           </item>
          </layout>
         </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>KMessageWidget</class>
-   <extends>QWidget</extends>
+   <extends>QFrame</extends>
    <header location="global">kmessagewidget.h</header>
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
    <header location="global">kurlrequester.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/languages/plugins/custom-definesandincludes/kcm_widget/includeswidget.ui b/languages/plugins/custom-definesandincludes/kcm_widget/includeswidget.ui
index 010ff30a16..23b38c24c6 100644
--- a/languages/plugins/custom-definesandincludes/kcm_widget/includeswidget.ui
+++ b/languages/plugins/custom-definesandincludes/kcm_widget/includeswidget.ui
@@ -1,110 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>IncludesWidget</class>
  <widget class="QWidget" name="IncludesWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>545</width>
     <height>298</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <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>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="KUrlRequester" name="includePathRequester">
        <property name="toolTip">
         <string>Add the currently displayed URL to the list of includes if it is not in the list yet.</string>
        </property>
        <property name="clickMessage" stdset="0">
         <string>A new include path/file to use for parsing files under given directory</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="addIncludePath">
        <property name="enabled">
         <bool>true</bool>
        </property>
        <property name="toolTip">
         <string>Create a new include path entry from this URL.</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset theme="list-add">
          <normaloff/>
         </iconset>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="removeIncludePath">
        <property name="enabled">
         <bool>false</bool>
        </property>
        <property name="toolTip">
         <string>Delete current include path entry.</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset theme="list-remove">
          <normaloff/>
         </iconset>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QListView" name="includePaths">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>8</verstretch>
       </sizepolicy>
      </property>
      <property name="selectionBehavior">
       <enum>QAbstractItemView::SelectRows</enum>
      </property>
     </widget>
    </item>
    <item>
     <widget class="KMessageWidget" name="errorWidget" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
    <header location="global">kurlrequester.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
-   <extends>QWidget</extends>
+   <extends>QFrame</extends>
    <header location="global">kmessagewidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/projectmanagers/qmake/qmakebuilddirchooser.ui b/projectmanagers/qmake/qmakebuilddirchooser.ui
index ea308adf32..c991bb0d72 100644
--- a/projectmanagers/qmake/qmakebuilddirchooser.ui
+++ b/projectmanagers/qmake/qmakebuilddirchooser.ui
@@ -1,166 +1,166 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QMakeBuildDirChooser</class>
  <widget class="QWidget" name="QMakeBuildDirChooser">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>611</width>
     <height>200</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>600</width>
     <height>200</height>
    </size>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="fieldGrowthPolicy">
     <enum>QFormLayout::ExpandingFieldsGrow</enum>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>QMake &amp;binary:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_qmakeBin</cstring>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="KUrlRequester" name="kcfg_qmakeBin">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>&amp;Build directory:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_buildDir</cstring>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="KUrlRequester" name="kcfg_buildDir"/>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>&amp;Install to (target.path):</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_installPrefix</cstring>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="KUrlRequester" name="kcfg_installPrefix">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Build &amp;type:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>kcfg_buildType</cstring>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="QComboBox" name="kcfg_buildType">
      <property name="editable">
       <bool>false</bool>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <item>
       <property name="text">
        <string notr="true">Debug</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string notr="true">Release</string>
       </property>
      </item>
      <item>
       <property name="text">
        <string>(Use default from .pro file)</string>
       </property>
      </item>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>Extra arguments:</string>
      </property>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="KLineEdit" name="kcfg_extraArgs"/>
    </item>
    <item row="5" column="0" colspan="2">
     <widget class="KMessageWidget" name="status" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
-   <extends>QWidget</extends>
+   <extends>QFrame</extends>
    <header location="global">kmessagewidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>kcfg_qmakeBin</tabstop>
   <tabstop>kcfg_buildDir</tabstop>
   <tabstop>kcfg_installPrefix</tabstop>
   <tabstop>kcfg_buildType</tabstop>
   <tabstop>kcfg_extraArgs</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>