Sort list for test

core/autotests/mail/data/import/identities/references/identities/emailidentities

@@ -24,8 +24,6 @@ Pgp Auto Encrypt=false
 Pgp Auto Sign=false
 Preferred Crypto Message Format=openpgp/mime
 Reply-To Address=foo@kde.org
-SMIME Encryption Key=E225DBF44009243D1F177F552D5397C
-SMIME Signing Key=9243D1F177F552D5397C
 Signature Enabled=true
 Signature Type=inline
 Templates=3735
@@ -49,13 +47,9 @@ Image Location=
 Inline Signature=OpenGL Experts\n
 Inlined Html=false
 Name=Bla Bli
-Organization=kde
-PGP Encryption Key=CDF87D8A5BAA692D34B30D1065D31
-PGP Signing Key=F87D8A5BAA692D34B30D1065D31
 Pgp Auto Encrypt=false
 Pgp Auto Sign=false
 Preferred Crypto Message Format=s/mime
-Reply-To Address=foo@kde.org
 SMIME Encryption Key=E225DBF44009243D1F177F552D5397C
 SMIME Signing Key=9243D1F177F552D5397C
 Signature Enabled=true

core/mail/importmailjobinterface.cpp

@@ -866,8 +866,9 @@ void ImportMailJobInterface::restoreIdentity()
             KConfigGroup general = identityConfig->group(QStringLiteral("General"));
             const int defaultIdentity = general.readEntry(QStringLiteral("Default Identity"), -1);
 
-            const QStringList identityList = identityConfig->groupList().filter(QRegularExpression(QStringLiteral("Identity #\\d+")));
-            for (const QString &identityStr : identityList) {
+            QStringList identityList = identityConfig->groupList().filter(QRegularExpression(QStringLiteral("Identity #\\d+")));
+            std::sort(identityList.begin(), identityList.end());
+            for (const QString &identityStr : qAsConst(identityList)) {
                 KConfigGroup group = identityConfig->group(identityStr);
                 int oldUid = -1;
                 const QString uidStr(QStringLiteral("uoid"));