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

Android: Don't require arguments for a service

Browse Source 
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>
This commit is contained in:
Ville Voutilainen
2020-09-01 18:33:47 +03:00
parent ed4704e0b4
commit fdedd9570b
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androidservicewidget.cpp
View File

@@ -42,8 +42,7 @@ bool AndroidServiceData::isValid() const
{ {
return !m_className.isEmpty() return !m_className.isEmpty()
&& (!m_isRunInExternalProcess || !m_externalProcessName.isEmpty()) && (!m_isRunInExternalProcess || !m_externalProcessName.isEmpty())
&& (!m_isRunInExternalLibrary || !m_externalLibName.isEmpty()) && (!m_isRunInExternalLibrary || !m_externalLibName.isEmpty());
&& (m_isRunInExternalLibrary || !m_serviceArguments.isEmpty());
} }
void AndroidServiceData::setClassName(const QString &className) 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"); 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()) 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"); 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) { } else if (role == Qt::EditRole) {
if (index.column() == 0) if (index.column() == 0)
return m_services[index.row()].className(); return m_services[index.row()].className();
@@ -287,10 +284,6 @@ QVariant AndroidServiceWidget::AndroidServiceModel::data(const QModelIndex &inde
if (m_services[index.row()].isRunInExternalLibrary() if (m_services[index.row()].isRunInExternalLibrary()
&& m_services[index.row()].externalLibraryName().isEmpty()) && m_services[index.row()].externalLibraryName().isEmpty())
return Utils::Icons::WARNING.icon(); 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 {}; return {};