Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[qtcontacts-sqlite] Tests require lastName display label group. Contr…
…ibutes to JB#50555
  • Loading branch information
Chris Adams committed Oct 2, 2020
1 parent 016c788 commit e4a54c0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/engine/contactsdatabase.cpp
Expand Up @@ -3189,6 +3189,7 @@ ContactsDatabase::ContactsDatabase(ContactsEngine *engine)
: m_engine(engine)
, m_mutex(QMutex::Recursive)
, m_nonprivileged(false)
, m_autoTest(false)
, m_localeName(QLocale().name())
, m_defaultGenerator(new DefaultDlgGenerator)
#ifdef HAS_MLITE
Expand Down Expand Up @@ -3249,9 +3250,10 @@ bool ContactsDatabase::open(const QString &connectionName, bool nonprivileged, b
{
QMutexLocker locker(accessMutex());

m_autoTest = autoTest;
if (m_dlgGenerators.isEmpty()) {
for (auto generator : s_dlgGenerators) {
if (generator && (generator->name().contains(QStringLiteral("test")) == autoTest)) {
if (generator && (generator->name().contains(QStringLiteral("test")) == m_autoTest)) {
m_dlgGenerators.append(generator);
}
}
Expand Down Expand Up @@ -3302,7 +3304,7 @@ bool ContactsDatabase::open(const QString &connectionName, bool nonprivileged, b
const QString privilegedDataDirPath(systemDataDirPath + QTCONTACTS_SQLITE_PRIVILEGED_DIR + "/");

QString databaseSubdir(QStringLiteral(QTCONTACTS_SQLITE_DATABASE_DIR));
if (autoTest) {
if (m_autoTest) {
databaseSubdir.append(QStringLiteral("-test"));
}

Expand Down Expand Up @@ -3832,7 +3834,7 @@ QString ContactsDatabase::displayLabelGroupPreferredProperty() const
}
}
#endif
return retn;
return m_autoTest ? QStringLiteral("QContactName::FieldLastName") : retn;
}

QString ContactsDatabase::determineDisplayLabelGroup(const QContact &c, bool *emitDisplayLabelGroupChange)
Expand Down
1 change: 1 addition & 0 deletions src/engine/contactsdatabase.h
Expand Up @@ -199,6 +199,7 @@ class ContactsDatabase
QMutex m_mutex;
mutable QScopedPointer<ProcessMutex> m_processMutex;
bool m_nonprivileged;
bool m_autoTest;
QString m_localeName;
QHash<QString, QSqlQuery> m_preparedQueries;
QVector<QtContactsSqliteExtensions::DisplayLabelGroupGenerator*> m_dlgGenerators;
Expand Down

0 comments on commit e4a54c0

Please sign in to comment.