summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidrunconfiguration.h
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2013-10-09 16:25:57 +0200
committerDaniel Teske <daniel.teske@digia.com>2013-10-09 16:36:29 +0200
commita97dd8aba6039f3d295adee1fd2fa34334a395d7 (patch)
tree2cb19889f9278fa9ed323240f988bcd070861c5c /src/plugins/android/androidrunconfiguration.h
parent0a43f097de0629d6c751492588fb42d3f273cab6 (diff)
downloadqt-creator-a97dd8aba6039f3d295adee1fd2fa34334a395d7.tar.gz
AndroidRunConfiguration: Take .pro file parsing into account
Disable the runconfiguration if the project could not be parsed. Change-Id: I979315b5e38fd1d8674da68289e021e014070c54 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/android/androidrunconfiguration.h')
-rw-r--r--src/plugins/android/androidrunconfiguration.h10
1 files changed, 10 insertions, 0 deletions
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 <projectexplorer/runconfiguration.h>
+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