feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AndroidRunConfiguration: Take .pro file parsing into account

Browse Source 
Disable the runconfiguration if the project could not be parsed.

Change-Id: I979315b5e38fd1d8674da68289e021e014070c54
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2013-10-09 16:25:57 +02:00
parent 0a43f097de
commit a97dd8aba6
3 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidrunconfiguration.h
View File

@@ -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