From a97dd8aba6039f3d295adee1fd2fa34334a395d7 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 9 Oct 2013 16:25:57 +0200 Subject: AndroidRunConfiguration: Take .pro file parsing into account Disable the runconfiguration if the project could not be parsed. Change-Id: I979315b5e38fd1d8674da68289e021e014070c54 Reviewed-by: Daniel Teske --- src/plugins/android/androidrunconfiguration.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/plugins/android/androidrunconfiguration.h') diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h index 9e0fd50cd7..7290b84d7b 100644 --- a/src/plugins/android/androidrunconfiguration.h +++ b/src/plugins/android/androidrunconfiguration.h @@ -35,6 +35,8 @@ #include +namespace Qt4ProjectManager { class Qt4ProFileNode; } + namespace Android { namespace Internal { @@ -59,14 +61,22 @@ public: const QString remoteChannel() const; const QString dumperLib() const; + bool isEnabled() const; + QString disabledReason() const; protected: AndroidRunConfiguration(ProjectExplorer::Target *parent, AndroidRunConfiguration *source); QString defaultDisplayName(); + bool fromMap(const QVariantMap &map); + QVariantMap toMap() const; +private slots: + void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress); private: void init(); QString m_proFilePath; + bool m_parseSuccess; + bool m_parseInProgress; }; } // namespace Internal -- cgit v1.2.1