diff --git a/languages/clang/clangsettings/sessionsettings/sessionsettings.ui b/languages/clang/clangsettings/sessionsettings/sessionsettings.ui
index e52f8ad9c1..bfb1fcb02d 100644
--- a/languages/clang/clangsettings/sessionsettings/sessionsettings.ui
+++ b/languages/clang/clangsettings/sessionsettings/sessionsettings.ui
@@ -1,100 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SessionSettings</class>
  <widget class="QWidget" name="SessionSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>669</width>
     <height>489</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
   <layout class="QGridLayout" name="gridLayout">
    <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 row="0" column="0">
     <widget class="QGroupBox" name="groupBox_4">
      <property name="title">
       <string>Code-completion</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
       <item row="0" column="0">
        <widget class="QCheckBox" name="kcfg_macros">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If disabled, macros will not be included in the code-completion results. This can improve the responsiveness of code-completion in some cases.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Add macros to code-completion</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QCheckBox" name="kcfg_lookAhead">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="text">
          <string>Enable Look-ahead code-completion</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Assistants</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <item row="0" column="0">
        <widget class="QCheckBox" name="kcfg_forwardDeclare">
         <property name="text">
          <string>Forward declare assistant</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </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>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>
diff --git a/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.ui b/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.ui
index a25c665bc1..f06364c382 100644
--- a/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.ui
+++ b/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.ui
@@ -1,219 +1,216 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ParserWidget</class>
  <widget class="QWidget" name="ParserWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>579</width>
     <height>407</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="0">
     <widget class="QCheckBox" name="parseHeadersInPlainC">
      <property name="toolTip">
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Check this if you want &lt;code&gt;*.h&lt;code/&gt; headers to be parsed in plain C mode. By default they are parsed as C++ headers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>Parse *.h headers in plain C</string>
      </property>
     </widget>
    </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string/>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>C++ Profi&amp;le:</string>
         </property>
         <property name="buddy">
          <cstring>languageStandardsCpp</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QComboBox" name="languageStandardsCpp">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>100</width>
           <height>0</height>
          </size>
         </property>
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose language profile. &lt;/p&gt;&lt;p&gt;Use &amp;quot;Custom&amp;quot; profile to modify parser command-line arguments&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <item>
          <property name="text">
           <string>Custom</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>c++03</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>c++11</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>c++14</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>c99</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="argumentsLabel">
         <property name="text">
          <string>C++ co&amp;mmand-line arguments:</string>
         </property>
         <property name="buddy">
          <cstring>parserOptionsCpp</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLineEdit" name="parserOptionsCpp">
         <property name="minimumSize">
          <size>
           <width>100</width>
           <height>0</height>
          </size>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>C Profi&amp;le:</string>
         </property>
         <property name="buddy">
          <cstring>languageStandardsCpp</cstring>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QComboBox" name="languageStandardsC">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>100</width>
           <height>0</height>
          </size>
         </property>
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose language profile. &lt;/p&gt;&lt;p&gt;Use &amp;quot;Custom&amp;quot; profile to modify parser command-line arguments&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <item>
          <property name="text">
           <string>Custom</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>c99</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>gnu99</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>c11</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>gnu11</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>c++11</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="4" column="0">
        <widget class="QLabel" name="argumentsLabel_2">
         <property name="text">
          <string>C co&amp;mmand-line arguments:</string>
         </property>
         <property name="buddy">
          <cstring>parserOptionsC</cstring>
         </property>
        </widget>
       </item>
       <item row="4" column="1">
        <widget class="QLineEdit" name="parserOptionsC">
         <property name="minimumSize">
          <size>
           <width>100</width>
           <height>0</height>
          </size>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <spacer name="verticalSpacer_2">
         <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>
    </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>406</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>
diff --git a/languages/qmljs/libs/CMakeLists.txt b/languages/qmljs/libs/CMakeLists.txt
index 216eba98c5..ce61c81c43 100644
--- a/languages/qmljs/libs/CMakeLists.txt
+++ b/languages/qmljs/libs/CMakeLists.txt
@@ -1,62 +1,61 @@
 qt5_wrap_ui(uifiles_SRCS
 	utils/projectintropage.ui
 	utils/filewizardpage.ui
-	utils/submiteditorwidget.ui
 	utils/newclasswidget.ui
 )
 
 add_library(kdevqtc-qmlsupport STATIC
 	${uifiles_SRCS}
 	languageutils/componentversion.cpp
 	languageutils/fakemetaobject.cpp
 	qmljs/parser/qmldirparser.cpp
 	qmljs/parser/qmlerror.cpp
 	qmljs/parser/qmljsast.cpp
 	qmljs/parser/qmljsastvisitor.cpp
 	qmljs/parser/qmljsengine_p.cpp
 	qmljs/parser/qmljsgrammar.cpp
 	qmljs/parser/qmljslexer.cpp
 	qmljs/parser/qmljsparser.cpp
 	qmljs/qmljsdocument.cpp
 	qmljs/qmljsutils.cpp
 	utils/changeset.cpp
 	utils/fileutils.cpp
 	utils/qtcassert.cpp
 	utils/savefile.cpp
 	utils/json.cpp
 	utils/filesystemwatcher.cpp
 	utils/environment.cpp
 	utils/hostosinfo.cpp
 
     qmljs/persistenttrie.cpp
     qmljs/qmljsbind.cpp
     qmljs/qmljsbundle.cpp
     qmljs/qmljscontext.cpp
     qmljs/qmljsdialect.cpp
     qmljs/qmljsevaluate.cpp
     qmljs/qmljsimportdependencies.cpp
     qmljs/qmljsinterpreter.cpp
     qmljs/qmljsmodelmanagerinterface.cpp
     qmljs/qmljsplugindumper.cpp
     qmljs/qmljsqrcparser.cpp
     qmljs/qmljsscopeastpath.cpp
     qmljs/qmljsscopebuilder.cpp
     qmljs/qmljsscopechain.cpp
     qmljs/qmljstypedescriptionreader.cpp
     qmljs/qmljsvalueowner.cpp
     qmljs/qmljsviewercontext.cpp
 )
 
 if (APPLE) 
     target_sources(kdevqtc-qmlsupport PRIVATE utils/fileutils_mac.mm)
     target_link_libraries(kdevqtc-qmlsupport LINK_PRIVATE "-framework Foundation" )
 endif()
 
 set_target_properties(kdevqtc-qmlsupport PROPERTIES COMPILE_FLAGS "-DLANGUAGEUTILS_BUILD_DIR\ -DQTCREATOR_UTILS_LIB")
 target_link_libraries(kdevqtc-qmlsupport LINK_PRIVATE
     Qt5::Core
     Qt5::Gui
     Qt5::Widgets
     Qt5::Network
     Qt5::Xml
 )
diff --git a/languages/qmljs/libs/utils/submiteditorwidget.ui b/languages/qmljs/libs/utils/submiteditorwidget.ui
deleted file mode 100644
index 526408e11f..0000000000
--- a/languages/qmljs/libs/utils/submiteditorwidget.ui
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Utils::SubmitEditorWidget</class>
- <widget class="QWidget" name="Utils::SubmitEditorWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>582</width>
-    <height>502</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Subversion Submit</string>
-  </property>
-  <layout class="QVBoxLayout">
-   <item>
-    <widget class="QSplitter" name="splitter">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="childrenCollapsible">
-      <bool>false</bool>
-     </property>
-     <widget class="QGroupBox" name="descriptionBox">
-      <property name="title">
-       <string>Descriptio&amp;n</string>
-      </property>
-      <property name="flat">
-       <bool>true</bool>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="Utils::CompletingTextEdit" name="description">
-         <property name="acceptRichText">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="verticalLayoutWidget">
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QGroupBox" name="groupBox">
-         <property name="title">
-          <string>F&amp;iles</string>
-         </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
-          <item>
-           <widget class="QCheckBox" name="checkAllCheckBox">
-            <property name="text">
-             <string>Check a&amp;ll</string>
-            </property>
-            <property name="tristate">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QTreeView" name="fileView"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="buttonLayout">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <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>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>Utils::CompletingTextEdit</class>
-   <extends>QTextEdit</extends>
-   <header>utils/completingtextedit.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>