diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2020-09-01 18:33:47 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2020-09-02 07:27:32 +0000 |
| commit | fdedd9570be3ae2b0a43a4e911b9b437db09113f (patch) | |
| tree | 52a12c35e7e41eb3353f5f7697519a3572c7a48e | |
| parent | ed4704e0b4d14dd824327f1346f1f98052d66a9f (diff) | |
Android: Don't require arguments for a service
Task-number: QTCREATORBUG-24557
Change-Id: Ifc1c9c5c2fcfaba48e043e4334fb019efa611f39
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
| -rw-r--r-- | src/plugins/android/androidservicewidget.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/plugins/android/androidservicewidget.cpp b/src/plugins/android/androidservicewidget.cpp index 465d2e2600..dd4e1f297a 100644 --- a/src/plugins/android/androidservicewidget.cpp +++ b/src/plugins/android/androidservicewidget.cpp @@ -42,8 +42,7 @@ bool AndroidServiceData::isValid() const { return !m_className.isEmpty() && (!m_isRunInExternalProcess || !m_externalProcessName.isEmpty()) - && (!m_isRunInExternalLibrary || !m_externalLibName.isEmpty()) - && (m_isRunInExternalLibrary || !m_serviceArguments.isEmpty()); + && (!m_isRunInExternalLibrary || !m_externalLibName.isEmpty()); } void AndroidServiceData::setClassName(const QString &className) @@ -264,8 +263,6 @@ QVariant AndroidServiceWidget::AndroidServiceModel::data(const QModelIndex &inde return tr("The process name must be set for a service run in an external process"); else if (index.column() == 4 && m_services[index.row()].isRunInExternalLibrary()) return tr("The library name must be set for a service run in an external library"); - else if (index.column() == 5 && !m_services[index.row()].isRunInExternalLibrary()) - return tr("The service arguments must be set for a service not run in an external library"); } else if (role == Qt::EditRole) { if (index.column() == 0) return m_services[index.row()].className(); @@ -287,10 +284,6 @@ QVariant AndroidServiceWidget::AndroidServiceModel::data(const QModelIndex &inde if (m_services[index.row()].isRunInExternalLibrary() && m_services[index.row()].externalLibraryName().isEmpty()) return Utils::Icons::WARNING.icon(); - } else if (index.column() == 5) { - if (!m_services[index.row()].isRunInExternalLibrary() - && m_services[index.row()].serviceArguments().isEmpty()) - return Utils::Icons::WARNING.icon(); } } return {}; |