1 files changed, 7 insertions, 8 deletions

diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index a814cbce1d..58863844d7 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -42,7 +42,7 @@
 #include <QFuture>
 
 QT_BEGIN_NAMESPACE
-class QMakeGlobals;
+class ProFileGlobals;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer { class DeploymentData; }
@@ -92,8 +92,6 @@ public:
     virtual QStringList files(FilesMode fileMode) const;
     virtual QString generatedUiHeader(const QString &formFile) const;
 
-    QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
-
     QList<Qt4ProFileNode *> allProFiles() const;
     QList<Qt4ProFileNode *> applicationProFiles() const;
     bool hasApplicationProFile(const QString &path) const;
@@ -102,9 +100,9 @@ public:
     void notifyChanged(const QString &name);
 
     /// \internal
-    QtSupport::ProFileReader *createProFileReader(Qt4ProFileNode *qt4ProFileNode, Qt4BuildConfiguration *bc = 0);
+    QtSupport::ProFileReader *createProFileReader(const Qt4ProFileNode *qt4ProFileNode, Qt4BuildConfiguration *bc = 0);
     /// \internal
-    QMakeGlobals *qmakeGlobals();
+    ProFileGlobals *qmakeGlobals();
     /// \internal
     void destroyProFileReader(QtSupport::ProFileReader *reader);
 
@@ -144,7 +142,7 @@ public:
     void emitBuildDirectoryInitialized();
 
 signals:
-    void kitUpdated(Qt4ProjectManager::Qt4ProFileNode *node, bool, bool);
+    void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *node, bool, bool);
     void buildDirectoryInitialized();
     void proFilesEvaluated();
 
@@ -155,6 +153,8 @@ public slots:
 
 protected:
     bool fromMap(const QVariantMap &map);
+    bool setupTarget(ProjectExplorer::Target *t);
+    void setupTarget(ProjectExplorer::Target *t, const QList<BuildConfigurationInfo> &infoList);
 
 private slots:
     void asyncUpdate();
@@ -195,7 +195,7 @@ private:
     Internal::Qt4ProjectFiles *m_projectFiles;
 
     // cached data during project rescan
-    QMakeGlobals *m_qmakeGlobals;
+    ProFileGlobals *m_qmakeGlobals;
     int m_qmakeGlobalsRefCnt;
 
     QTimer m_asyncUpdateTimer;
@@ -204,7 +204,6 @@ private:
     enum AsyncUpdateState { NoState, Base, AsyncFullUpdatePending, AsyncPartialUpdatePending, AsyncUpdateInProgress, ShuttingDown };
     AsyncUpdateState m_asyncUpdateState;
     bool m_cancelEvaluate;
-    bool m_codeModelCanceled;
     QList<Qt4ProFileNode *> m_partialEvaluate;
 
     QFuture<void> m_codeModelFuture;