From 36f6c02f1cea8fb54b1ffbbefca51fb218786152 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 17 Jul 2012 15:56:43 +0200 Subject: Remove evaluateBuildSystem signal It adds almost nothing and introduced some bugs. This fixes: Double evaluation in cmakeproject on build directory changes. Wrong runconfiguration update in cmake for set_target_properties(target PROPERTIES OUTPUT_NAME [..]) changes. Unecessary runconfiguration removal in AutoTools and Generic projectmanager. Reevaluation of .pro files on changing the active runconfiguration or deploy configuration. Task-number: QTCREATORBUG-7723 Task-number: QTCREATORBUG-7761 Change-Id: I50249b186917cd3a4f399f187f09ac8428ab6f9e Reviewed-by: Tobias Hunger --- src/plugins/qt4projectmanager/qt4project.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/plugins/qt4projectmanager/qt4project.h') diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h index 8bd0bfc18a..58e0287c5d 100644 --- a/src/plugins/qt4projectmanager/qt4project.h +++ b/src/plugins/qt4projectmanager/qt4project.h @@ -145,8 +145,10 @@ public: signals: void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *node, bool, bool); void buildDirectoryInitialized(); + void proFilesEvaluated(); public slots: + void scheduleAsyncUpdate(); void proFileParseError(const QString &errorMessage); void update(); @@ -159,8 +161,7 @@ private slots: void activeTargetWasChanged(); private: - void evaluateBuildSystem(); - void scheduleAsyncUpdate(); + void updateRunConfigurations(); void updateCppCodeModel(); void updateQmlJSCodeModel(); @@ -209,6 +210,8 @@ private: Internal::CentralizedFolderWatcher *m_centralizedFolderWatcher; + ProjectExplorer::Target *m_activeTarget; + friend class Internal::Qt4ProjectFile; friend class Internal::Qt4ProjectConfigWidget; friend class Qt4Manager; // to schedule a async update if the unconfigured settings change -- cgit v1.2.1