diff --git a/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp b/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
new file mode 100644
index 00000000000..baf1e00855d
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
@@ -0,0 +1,157 @@
+#include "qtuicodemodelsupport.h"
+
+#include "qt4project.h"
+#include <designer/formwindoweditor.h>
+
+using namespace Qt4ProjectManager;
+using namespace Internal;
+
+Qt4UiCodeModelSupport::Qt4UiCodeModelSupport(CppTools::CppModelManagerInterface *modelmanager,
+                                             Qt4Project *project,
+                                             const QString &source,
+                                             const QString &uiHeaderFile)
+    : CppTools::AbstractEditorSupport(modelmanager),
+      m_project(project),
+      m_sourceName(source),
+      m_fileName(uiHeaderFile),
+      m_updateIncludingFiles(false)
+{
+    qDebug()<<"ctor Qt4UiCodeModelSupport for"<<m_sourceName;
+    init();
+}
+
+Qt4UiCodeModelSupport::~Qt4UiCodeModelSupport()
+{
+    qDebug()<<"dtor ~Qt4UiCodeModelSupport for"<<m_sourceName;
+}
+
+void Qt4UiCodeModelSupport::init()
+{
+    QDateTime sourceTime = QFileInfo(m_sourceName).lastModified();
+    QFileInfo uiHeaderFileInfo(m_fileName);
+    QDateTime uiHeaderTime = uiHeaderFileInfo.exists() ? uiHeaderFileInfo.lastModified() : QDateTime();
+    if (uiHeaderTime.isValid() && (uiHeaderTime > sourceTime)) {
+        QFile file(m_fileName);
+        if (file.open(QFile::ReadOnly)) {
+            qDebug()<<"ui*h file is more recent then source file, using information from ui*h file"<<m_fileName;
+            QTextStream stream(&file);
+            m_contents = stream.readAll().toUtf8();
+            m_cacheTime = uiHeaderTime;
+            return;
+        }
+    }
+
+    qDebug()<<"ui*h file not found, or not recent enough, trying to create it on the fly";
+    QFile file(m_sourceName);
+    if (file.open(QFile::ReadOnly)) {
+        QTextStream stream(&file);
+        const QString contents = stream.readAll();
+        if (runUic(contents)) {
+            qDebug()<<"created on the fly";
+            return;
+        } else {
+            // uic run was unsuccesfull
+            qDebug()<<"uic run wasn't succesfull";
+            m_cacheTime = QDateTime();
+            m_contents = QByteArray();
+            // and if the header file wasn't there, next time we need to update
+            // all of the files that include this header
+            if (!uiHeaderFileInfo.exists())
+                m_updateIncludingFiles = true;
+            return;
+        }
+    } else {
+        qDebug()<<"Could open "<<m_sourceName<<"needed for the cpp model";
+        m_contents = QByteArray();
+    }
+}
+
+QByteArray Qt4UiCodeModelSupport::contents() const
+{
+    return m_contents;
+}
+
+QString Qt4UiCodeModelSupport::fileName() const
+{
+    return m_fileName;
+}
+
+void Qt4UiCodeModelSupport::setFileName(const QString &name)
+{
+    if (m_fileName == name && m_cacheTime.isValid())
+        return;
+    m_fileName = name;
+    m_contents.clear();
+    m_cacheTime = QDateTime();
+    init();
+}
+
+bool Qt4UiCodeModelSupport::runUic(const QString &ui) const
+{
+    QProcess uic;
+    uic.setEnvironment(m_project->environment(m_project->activeBuildConfiguration()).toStringList());
+    uic.start(m_project->qtVersion(m_project->activeBuildConfiguration())->uicCommand(), QStringList(), QIODevice::ReadWrite);
+    uic.waitForStarted();
+    uic.write(ui.toUtf8());
+    uic.closeWriteChannel();
+    if (uic.waitForFinished()) {
+        m_contents = uic.readAllStandardOutput();
+        m_cacheTime = QDateTime::currentDateTime();
+//        qDebug()<<"\nusing uic from"<<m_project->qtVersion(m_project->activeBuildConfiguration())->uicCommand();
+//        qDebug()<<"resulted in:";
+//        qDebug()<< m_contents;
+//        qDebug()<<"=============================";
+        return true;
+    } else {
+        qDebug()<<"running uic failed"<<" using uic: "<<m_project->qtVersion(m_project->activeBuildConfiguration())->uicCommand();
+        qDebug()<<uic.readAllStandardError();
+        qDebug()<<uic.readAllStandardOutput();
+        qDebug()<<uic.errorString();
+        qDebug()<<uic.error();
+        uic.kill();
+    }
+    return false;
+}
+
+void Qt4UiCodeModelSupport::updateFromEditor(Designer::Internal::FormWindowEditor *fw)
+{
+    qDebug()<<"Qt4UiCodeModelSupport::updateFromEditor"<<fw;
+    if (runUic(fw->contents())) {
+        qDebug()<<"runUic: success, updated on the fly";
+        updateDocument();
+    } else {
+        qDebug()<<"runUic: failed, not updated";
+    }
+}
+
+void Qt4UiCodeModelSupport::updateFromBuild()
+{
+    qDebug()<<"Qt4UiCodeModelSupport::updateFromBuild() for file"<<m_sourceName;
+    // This is mostly a fall back for the cases when uic couldn't be run
+    // it pays special attention to the case where a ui_*h was newly created
+    QDateTime sourceTime = QFileInfo(m_sourceName).lastModified();
+    if (m_cacheTime.isValid() && m_cacheTime >= sourceTime) {
+        qDebug()<<"Cache is still more recent then source";
+        return;
+    } else {
+        QFileInfo fi(m_fileName);
+        QDateTime uiHeaderTime = fi.exists() ? fi.lastModified() : QDateTime();
+        if (uiHeaderTime.isValid() && (uiHeaderTime > sourceTime)) {
+            if (m_cacheTime >= uiHeaderTime)
+                return;
+            qDebug()<<"found ui*h updating from it";
+
+            QFile file(m_fileName);
+            if (file.open(QFile::ReadOnly)) {
+                QTextStream stream(&file);
+                m_contents = stream.readAll().toUtf8();
+                m_cacheTime = uiHeaderTime;
+                updateDocument();
+                return;
+            }
+        }
+
+        qDebug()<<"ui*h not found or not more recent then source not changing anything";
+    }
+}
+
diff --git a/src/plugins/qt4projectmanager/qtuicodemodelsupport.h b/src/plugins/qt4projectmanager/qtuicodemodelsupport.h
new file mode 100644
index 00000000000..4b968cbdbe8
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qtuicodemodelsupport.h
@@ -0,0 +1,75 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact:  Qt Software Information (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+**************************************************************************/
+
+#ifndef QTUICODEMODELSUPPORT_H
+#define QTUICODEMODELSUPPORT_H
+
+#include <cpptools/cppmodelmanagerinterface.h>
+
+#include <QtCore/QDateTime>
+
+namespace Designer {
+namespace Internal {
+class FormWindowEditor;
+}
+}
+
+namespace Qt4ProjectManager {
+class Qt4Project;
+namespace Internal {
+
+class Qt4UiCodeModelSupport : public CppTools::AbstractEditorSupport
+{
+public:
+    Qt4UiCodeModelSupport(CppTools::CppModelManagerInterface *modelmanager,
+                          Qt4Project *project,
+                          const QString &sourceFile,
+                          const QString &uiHeaderFile);
+    ~Qt4UiCodeModelSupport();
+    void setFileName(const QString &name);
+    void setSourceName(const QString &name);
+    virtual QByteArray contents() const;
+    virtual QString fileName() const;
+    void updateFromEditor(Designer::Internal::FormWindowEditor *);
+    void updateFromBuild();
+private:
+    void init();
+    bool runUic(const QString &ui) const;
+    Qt4Project *m_project;
+    QString m_sourceName;
+    QString m_fileName;
+    mutable bool m_updateIncludingFiles;
+    mutable QByteArray m_contents;
+    mutable QDateTime m_cacheTime;
+};
+
+
+} // Internal
+} // Qt4ProjectManager
+#endif // QTUICODEMODELSUPPORT_H