diff options
Diffstat (limited to 'src/plugins/android/androidrunconfiguration.cpp')
| -rw-r--r-- | src/plugins/android/androidrunconfiguration.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp index 41b81d1261..41f559d175 100644 --- a/src/plugins/android/androidrunconfiguration.cpp +++ b/src/plugins/android/androidrunconfiguration.cpp @@ -55,7 +55,7 @@ using namespace Utils; namespace Android { -BaseStringListAspect::BaseStringListAspect(const QString &settingsKey, Core::Id id) +BaseStringListAspect::BaseStringListAspect(const QString &settingsKey, Utils::Id id) { setSettingsKey(settingsKey); setId(id); @@ -104,7 +104,7 @@ void BaseStringListAspect::setLabel(const QString &label) } -AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Core::Id id) +AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id) : RunConfiguration(target, id) { auto envAspect = addAspect<EnvironmentAspect>(); @@ -120,8 +120,10 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Core::Id id) amStartArgsAspect->setHistoryCompleter("Android.AmStartArgs.History"); auto warning = addAspect<BaseStringAspect>(); + warning->setDisplayStyle(BaseStringAspect::LabelDisplay); warning->setLabelPixmap(Icons::WARNING.pixmap()); - warning->setValue(tr("If the \"am start\" options conflict, the application might not start.")); + warning->setValue(tr("If the \"am start\" options conflict, the application might not start.\n" + "Qt Creator uses: am start -n <package_name>/<Activity_name> [-D].")); auto preStartShellCmdAspect = addAspect<BaseStringListAspect>(); preStartShellCmdAspect->setId(Constants::ANDROID_PRESTARTSHELLCMDLIST); |