Merge branch 'jb47084' into 'master'

[qtcontacts-sqlite] Add a fallback to company name when synthesizing a display label. Fixes JB#47084

See merge request mer-core/qtcontacts-sqlite!37

src/engine/contactsdatabase.cpp

@@ -1308,6 +1308,10 @@ static const char *upgradeVersion18[] = {
     "PRAGMA user_version=19",
     0 // NULL-terminated
 };
+static const char *upgradeVersion19[] = {
+    "PRAGMA user_version=20",
+    0 // NULL-terminated
+};
 
 typedef bool (*UpgradeFunction)(QSqlDatabase &database);
 
@@ -1826,9 +1830,10 @@ static UpgradeOperation upgradeVersions[] = {
     { updateStorageTypes,           upgradeVersion16 },
     { addDisplayLabelGroup,         upgradeVersion17 },
     { forceRegenDisplayLabelGroups, upgradeVersion18 },
+    { forceRegenDisplayLabelGroups, upgradeVersion19 },
 };
 
-static const int currentSchemaVersion = 19;
+static const int currentSchemaVersion = 20;
 
 static bool execute(QSqlDatabase &database, const QString &statement)
 {

src/engine/contactsengine.cpp

@@ -1442,6 +1442,12 @@ QString ContactsEngine::synthesizedDisplayLabel(const QContact &contact, QContac
         }
     }
 
+    foreach (const QContactOrganization& organization, contact.details<QContactOrganization>()) {
+        if (!organization.name().isEmpty()) {
+            return organization.name();
+        }
+    }
+
     foreach (const QContactOnlineAccount& account, contact.details<QContactOnlineAccount>()) {
         if (!account.accountUri().isEmpty()) {
             return account.accountUri();