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

Show project name.

Browse Source 
Task-number: QTCREATORBUG-12877
Change-Id: I6126903f82e3cfa1dd2669a9f7333410e99e1aee
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2014-09-26 15:06:21 +03:00
parent 8872ef1b73
commit d3942a50a9
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androidrunconfiguration.cpp
View File

@@ -46,18 +46,11 @@ namespace Android {
AndroidRunConfiguration::AndroidRunConfiguration(Target *parent, Core::Id id) AndroidRunConfiguration::AndroidRunConfiguration(Target *parent, Core::Id id)
: RunConfiguration(parent, id) : RunConfiguration(parent, id)
{ {
init();
} }
AndroidRunConfiguration::AndroidRunConfiguration(Target *parent, AndroidRunConfiguration *source) AndroidRunConfiguration::AndroidRunConfiguration(Target *parent, AndroidRunConfiguration *source)
: RunConfiguration(parent, source) : RunConfiguration(parent, source)
{ {
init();
}
void AndroidRunConfiguration::init()
{
setDefaultDisplayName(defaultDisplayName());
} }
QWidget *AndroidRunConfiguration::createConfigurationWidget() QWidget *AndroidRunConfiguration::createConfigurationWidget()
@@ -70,11 +63,6 @@ Utils::OutputFormatter *AndroidRunConfiguration::createOutputFormatter() const
return new QtSupport::QtOutputFormatter(target()->project()); return new QtSupport::QtOutputFormatter(target()->project());
} }
QString AndroidRunConfiguration::defaultDisplayName()
{
return tr("Run on Android device");
}
const QString AndroidRunConfiguration::remoteChannel() const const QString AndroidRunConfiguration::remoteChannel() const
{ {
return QLatin1String(":5039"); return QLatin1String(":5039");

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

@@ -50,10 +50,6 @@ public:
protected: protected:
AndroidRunConfiguration(ProjectExplorer::Target *parent, AndroidRunConfiguration *source); AndroidRunConfiguration(ProjectExplorer::Target *parent, AndroidRunConfiguration *source);
QString defaultDisplayName();
private:
void init();
}; };
} // namespace Android } // namespace Android

13
src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
View File

@@ -48,6 +48,13 @@ using QmakeProjectManager::QmakeProject;
namespace QmakeAndroidSupport { namespace QmakeAndroidSupport {
namespace Internal { namespace Internal {
static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:";
static QString pathFromId(const Core::Id id)
{
return id.suffixAfter(ANDROID_RC_ID_PREFIX);
}
QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *parent, Core::Id id, const QString &path) QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *parent, Core::Id id, const QString &path)
: AndroidRunConfiguration(parent, id) : AndroidRunConfiguration(parent, id)
, m_proFilePath(path) , m_proFilePath(path)
@@ -69,6 +76,7 @@ QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *parent, Qmake
void QmakeAndroidRunConfiguration::init() void QmakeAndroidRunConfiguration::init()
{ {
setDefaultDisplayName(defaultDisplayName());
connect(target()->project(), SIGNAL(proFileUpdated(QmakeProjectManager::QmakeProFileNode*,bool,bool)), connect(target()->project(), SIGNAL(proFileUpdated(QmakeProjectManager::QmakeProFileNode*,bool,bool)),
this, SLOT(proFileUpdated(QmakeProjectManager::QmakeProFileNode*,bool,bool))); this, SLOT(proFileUpdated(QmakeProjectManager::QmakeProFileNode*,bool,bool)));
} }
@@ -97,6 +105,11 @@ QVariantMap QmakeAndroidRunConfiguration::toMap() const
return map; return map;
} }
QString QmakeAndroidRunConfiguration::defaultDisplayName()
{
return QFileInfo(pathFromId(id())).completeBaseName();
}
bool QmakeAndroidRunConfiguration::isEnabled() const bool QmakeAndroidRunConfiguration::isEnabled() const
{ {
return m_parseSuccess && !m_parseInProgress; return m_parseSuccess && !m_parseInProgress;

1
src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
View File

@@ -55,6 +55,7 @@ protected:
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map);
QVariantMap toMap() const; QVariantMap toMap() const;
QString defaultDisplayName();
private slots: private slots:
void proFileUpdated(QmakeProjectManager::QmakeProFileNode *pro, bool success, bool parseInProgress); void proFileUpdated(QmakeProjectManager::QmakeProFileNode *pro, bool success, bool parseInProgress);