Skip to content

Commit 61f1f61

Browse files
authored
Merge pull request #1078 from deXol/develop
Fix Qt 5.12.7 build issues
2 parents d4b2593 + 9a33196 commit 61f1f61

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

src/CredentialsManagement.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,12 @@ void CredentialsManagement::checkLinkingOnLoginSelected(const QModelIndex &srcIn
14041404

14051405
QString CredentialsManagement::processMultipleDomainsInput(const QString& service, const QString &domains)
14061406
{
1407-
auto domainList = domains.split(MULT_DOMAIN_SEPARATOR, Qt::SkipEmptyParts);
1407+
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
1408+
auto splitBehavior = QString::SkipEmptyParts;
1409+
#else
1410+
auto splitBehavior = Qt::SkipEmptyParts;
1411+
#endif
1412+
auto domainList = domains.split(MULT_DOMAIN_SEPARATOR, splitBehavior);
14081413
QStringList validDomains;
14091414
QString result = "";
14101415
auto serviceDomain = service;
@@ -1413,13 +1418,13 @@ QString CredentialsManagement::processMultipleDomainsInput(const QString& servic
14131418
ParseDomain parsedService{service};
14141419
serviceDomain = parsedService.domain();
14151420
}
1416-
for (auto domain : domainList)
1421+
for (auto& domain : domainList)
14171422
{
14181423
if (!domain.startsWith('.'))
14191424
{
14201425
domain.prepend('.');
14211426
}
1422-
ParseDomain dom{serviceDomain + domain};
1427+
ParseDomain dom(serviceDomain + domain);
14231428
if (domain == dom.tld())
14241429
{
14251430
validDomains.append(domain);

0 commit comments

Comments
 (0)