← Back to branch summary

~bzoltan/kubuntu-packaging/decouple_cmake_plugin

« back to all changes in this revision

Viewing changes to src/plugins/android/androidrunconfiguration.cpp

  • Committer: Timo Jyrinki
  • Date: 2013-12-02 09:16:15 UTC
  • mfrom: (1.1.29)
  • Revision ID: timo.jyrinki@canonical.com-20131202091615-xbj1os1f604ber1m
New upstream release candidate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/android/androidrunconfiguration.cpp
37
37
#include <projectexplorer/target.h>
38
38
#include <qtsupport/qtoutputformatter.h>
39
39
#include <qtsupport/qtkitinformation.h>
40
 
#include <qt4projectmanager/qmakeproject.h>
41
 
#include <qt4projectmanager/qmakenodes.h>
 
40
#include <qmakeprojectmanager/qmakeproject.h>
 
41
#include <qmakeprojectmanager/qmakenodes.h>
42
42
 
43
43
#include <utils/qtcassert.h>
44
44
 
47
47
}
48
48
 
49
49
using namespace ProjectExplorer;
50
 
using QmakeProjectManager::Qt4Project;
 
50
using QmakeProjectManager::QmakeProject;
51
51
 
52
52
namespace Android {
53
53
namespace Internal {
56
56
    : RunConfiguration(parent, id)
57
57
    , m_proFilePath(path)
58
58
{
59
 
    Qt4Project *project = static_cast<Qt4Project *>(parent->project());
 
59
    QmakeProject *project = static_cast<QmakeProject *>(parent->project());
60
60
    m_parseSuccess = project->validParse(m_proFilePath);
61
61
    m_parseInProgress = project->parseInProgress(m_proFilePath);
62
62
    init();
74
74
void AndroidRunConfiguration::init()
75
75
{
76
76
    setDefaultDisplayName(defaultDisplayName());
77
 
    connect(target()->project(), SIGNAL(proFileUpdated(QmakeProjectManager::Qt4ProFileNode*,bool,bool)),
78
 
            this, SLOT(proFileUpdated(QmakeProjectManager::Qt4ProFileNode*,bool,bool)));
 
77
    connect(target()->project(), SIGNAL(proFileUpdated(QmakeProjectManager::QmakeProFileNode*,bool,bool)),
 
78
            this, SLOT(proFileUpdated(QmakeProjectManager::QmakeProFileNode*,bool,bool)));
79
79
}
80
80
 
81
81
bool AndroidRunConfiguration::fromMap(const QVariantMap &map)
82
82
{
83
83
    const QDir projectDir = QDir(target()->project()->projectDirectory());
84
84
    m_proFilePath = QDir::cleanPath(projectDir.filePath(map.value(QLatin1String(PRO_FILE_KEY)).toString()));
85
 
    m_parseSuccess = static_cast<Qt4Project *>(target()->project())->validParse(m_proFilePath);
86
 
    m_parseInProgress = static_cast<Qt4Project *>(target()->project())->parseInProgress(m_proFilePath);
 
85
    m_parseSuccess = static_cast<QmakeProject *>(target()->project())->validParse(m_proFilePath);
 
86
    m_parseInProgress = static_cast<QmakeProject *>(target()->project())->parseInProgress(m_proFilePath);
87
87
 
88
88
    return RunConfiguration::fromMap(map);
89
89
}
108
108
                .arg(QFileInfo(m_proFilePath).fileName());
109
109
 
110
110
    if (!m_parseSuccess)
111
 
        return static_cast<Qt4Project *>(target()->project())->disabledReasonForRunConfiguration(m_proFilePath);
 
111
        return static_cast<QmakeProject *>(target()->project())->disabledReasonForRunConfiguration(m_proFilePath);
112
112
    return QString();
113
113
}
114
114
 
115
 
void AndroidRunConfiguration::proFileUpdated(QmakeProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress)
 
115
void AndroidRunConfiguration::proFileUpdated(QmakeProjectManager::QmakeProFileNode *pro, bool success, bool parseInProgress)
116
116
{
117
117
    if (m_proFilePath != pro->path())
118
118
        return;