diff --git a/src/plugins/qt4projectmanager/enveditdialog.ui b/src/plugins/qt4projectmanager/enveditdialog.ui
deleted file mode 100644
index acda028c179b626c6657b7938c665211122c4d5a..0000000000000000000000000000000000000000
--- a/src/plugins/qt4projectmanager/enveditdialog.ui
+++ /dev/null
@@ -1,236 +0,0 @@
-<ui version="4.0" >
- <class>Qt4ProjectManager::Internal::EnvEditDialog</class>
- <widget class="QDialog" name="Qt4ProjectManager::Internal::EnvEditDialog" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>398</width>
- <height>298</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Build Environment</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="envNameEdit" />
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_4" >
- <property name="text" >
- <string>Make Command:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="makeEdit" />
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Build Environment:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_5" >
- <property name="text" >
- <string>mkspec:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QComboBox" name="mkspecCombo" />
- </item>
- </layout>
- </item>
- <item>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="2" column="1" >
- <widget class="QLineEdit" name="varEdit" />
- </item>
- <item row="1" column="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>91</height>
- </size>
- </property>
- </spacer>
- </item>
- <item rowspan="2" row="0" column="0" colspan="2" >
- <widget class="QTreeWidget" name="varList" >
- <property name="uniformRowHeights" >
- <bool>true</bool>
- </property>
- <property name="itemsExpandable" >
- <bool>false</bool>
- </property>
- <property name="columnCount" >
- <number>2</number>
- </property>
- <column>
- <property name="text" >
- <string>0</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>1</string>
- </property>
- </column>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QLineEdit" name="valEdit" />
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="label_3" >
- <property name="text" >
- <string>Values:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
- <string>Variable:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2" >
- <widget class="QToolButton" name="addButton" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="2" >
- <widget class="QToolButton" name="delButton" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QPushButton" name="importButton" >
- <property name="text" >
- <string>Import</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>91</width>
- <height>31</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="okButton" >
- <property name="text" >
- <string>OK</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="cancelButton" >
- <property name="text" >
- <string>Cancel</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <tabstops>
- <tabstop>envNameEdit</tabstop>
- <tabstop>makeEdit</tabstop>
- <tabstop>mkspecCombo</tabstop>
- <tabstop>varEdit</tabstop>
- <tabstop>valEdit</tabstop>
- <tabstop>delButton</tabstop>
- <tabstop>addButton</tabstop>
- <tabstop>varList</tabstop>
- <tabstop>importButton</tabstop>
- <tabstop>okButton</tabstop>
- <tabstop>cancelButton</tabstop>
- </tabstops>
- <resources/>
- <connections>
- <connection>
- <sender>okButton</sender>
- <signal>clicked()</signal>
- <receiver>Qt4ProjectManager::Internal::EnvEditDialog</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>278</x>
- <y>253</y>
- </hint>
- <hint type="destinationlabel" >
- <x>96</x>
- <y>254</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>cancelButton</sender>
- <signal>clicked()</signal>
- <receiver>Qt4ProjectManager::Internal::EnvEditDialog</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>369</x>
- <y>253</y>
- </hint>
- <hint type="destinationlabel" >
- <x>179</x>
- <y>282</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
diff --git a/src/plugins/qt4projectmanager/envvariablespage.ui b/src/plugins/qt4projectmanager/envvariablespage.ui
deleted file mode 100644
index c4f6f558f2d5ddd692fc98ecd437f5eac0e42671..0000000000000000000000000000000000000000
--- a/src/plugins/qt4projectmanager/envvariablespage.ui
+++ /dev/null
@@ -1,118 +0,0 @@
-<ui version="4.0" >
- <class>Qt4ProjectManager::Internal::EnvVariablesPage</class>
- <widget class="QWidget" name="Qt4ProjectManager::Internal::EnvVariablesPage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>398</width>
- <height>336</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="title" >
- <string>Build Environments</string>
- </property>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QListWidget" name="listView" />
- </item>
- <item>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QPushButton" name="addButton" >
- <property name="text" >
- <string>Add...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="editButton" >
- <property name="text" >
- <string>Edit...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="delButton" >
- <property name="text" >
- <string>Delete</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_3" >
- <property name="text" >
- <string>Default mkspec:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
- <string>Default make command:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="mkspecEdit" />
- </item>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="defaultCmdEdit" />
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/plugins/qt4projectmanager/proeditorcontainer.ui b/src/plugins/qt4projectmanager/proeditorcontainer.ui
deleted file mode 100644
index 0edbfa3ff84449c76e7a012c020cc7716b9bb321..0000000000000000000000000000000000000000
--- a/src/plugins/qt4projectmanager/proeditorcontainer.ui
+++ /dev/null
@@ -1,69 +0,0 @@
-<ui version="4.0" >
- <class>ProEditorContainer</class>
- <widget class="QWidget" name="ProEditorContainer" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>503</width>
- <height>372</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" >
- <item>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
- <number>6</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="QTreeView" name="m_scopeList" >
- <property name="uniformRowHeights" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="Qt4ProjectManager::Internal::ProEditor" name="m_variableEdit" />
- </item>
- <item>
- <widget class="QCheckBox" name="m_advancedCheckBox" >
- <property name="text" >
- <string>Advanced Mode</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="Qt4ProjectManager::Internal::ValueEditor" native="1" name="m_valueEdit" />
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>Qt4ProjectManager::Internal::ProEditor</class>
- <extends>QFrame</extends>
- <header>proparser/proeditor.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>Qt4ProjectManager::Internal::ValueEditor</class>
- <extends>QWidget</extends>
- <header>valueeditor.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/plugins/qt4projectmanager/profileeditor.h b/src/plugins/qt4projectmanager/profileeditor.h
index 95e997afabb62465d0d7f629a693595ba313245f..8b75f3d2694bd6406cf872c2738367161b73ba13 100644
--- a/src/plugins/qt4projectmanager/profileeditor.h
+++ b/src/plugins/qt4projectmanager/profileeditor.h
@@ -30,8 +30,6 @@
#ifndef PROFILEEDITOR_H
#define PROFILEEDITOR_H
-#include "ui_proeditorcontainer.h"
-
#include <texteditor/basetextdocument.h>
#include <texteditor/basetexteditor.h>
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index d430f6604e989a21854dc226def13fe37b9f8635..a128681f17cb915a750c6268663ed372d86825fd 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -73,10 +73,7 @@ SOURCES = qt4projectmanagerplugin.cpp \
qtoptionspage.cpp \
qtuicodemodelsupport.cpp \
externaleditors.cpp
-FORMS = envvariablespage.ui \
- enveditdialog.ui \
- proeditorcontainer.ui \
- makestep.ui \
+FORMS = makestep.ui \
qmakestep.ui \
qt4projectconfigwidget.ui \
embeddedpropertiespage.ui \