Move Ui code model support into QtSupport

* Move basic ui code model support from CppTools into QtSupport
* Use Kit infrastructure to retrieve uicCommand and environment
* Remove specialization for cmake projects (no longer needed)
* Remove specialization for qmake based projects (no longer needed)

Change-Id: I8569cc01acb46a540883c2da235d169bebf7db39
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index 543f3bdc8fb..936139ea75f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -52,13 +52,13 @@ class QFileSystemWatcher;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer { class Target; }
+namespace QtSupport { class UiCodeModelSupport; }
 
 namespace CMakeProjectManager {
 namespace Internal {
 
 class CMakeFile;
 class CMakeBuildSettingsWidget;
-class CMakeUiCodeModelSupport;
 
 struct CMakeBuildTarget
 {
@@ -97,8 +97,6 @@ public:
     QString shadowBuildDirectory(const QString &projectFilePath, const ProjectExplorer::Kit *k,
                                  const QString &bcName);
 
-    QString uicCommand() const;
-
     bool isProjectFile(const QString &fileName);
 
     bool parseCMakeLists();
@@ -139,7 +137,6 @@ private:
     QString m_fileName;
     CMakeFile *m_file;
     QString m_projectName;
-    QString m_uicCommand;
 
     // TODO probably need a CMake specific node structure
     CMakeProjectNode *m_rootNode;
@@ -149,7 +146,7 @@ private:
     QSet<QString> m_watchedFiles;
     QFuture<void> m_codeModelFuture;
 
-    QMap<QString, CMakeUiCodeModelSupport *> m_uiCodeModelSupport;
+    QMap<QString, QtSupport::UiCodeModelSupport *> m_uiCodeModelSupport;
     Core::IEditor *m_lastEditor;
     bool m_dirtyUic;
 };