Merge branch 'mer-no-contacts-private' into 'master'

Tests, DisplayLabelGroups: remove contacts-private dependency See merge request mer-core/qtcontacts-sqlite!27
sailfishos · May 24, 2019 · 70f85e8 · 70f85e8
2 parents 47dc7f4 + 390e79e
commit 70f85e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/tests/auto/displaylabelgroups/test/test.pro b/tests/auto/displaylabelgroups/test/test.pro
@@ -1,9 +1,7 @@
 TARGET = tst_displaylabelgroups
 include (../../../common.pri)
 
-# We need access to QtContacts private headers
-QT += contacts-private
-# And we need access to the ContactManagerEngine header and moc output
+# We need access to the ContactManagerEngine header and moc output
 INCLUDEPATH += ../../../../src/extensions/
 HEADERS += ../../../../src/extensions/contactmanagerengine.h
 

diff --git a/tests/auto/displaylabelgroups/test/tst_displaylabelgroups.cpp b/tests/auto/displaylabelgroups/test/tst_displaylabelgroups.cpp
@@ -40,10 +40,10 @@
 #include <QContactPhoneNumber>
 #include <QContactHobby>
 
-#include <private/qcontactmanager_p.h>
 #include "contactmanagerengine.h"
 
 #include "qtcontacts-extensions.h"
+#include "qtcontacts-extensions_manager_impl.h"
 
 QTCONTACTS_USE_NAMESPACE
 
@@ -288,8 +288,8 @@ void tst_DisplayLabelGroups::testDisplayLabelGroups()
     // display label group generator plugin will generate a group
     // for it which was previously "unknown".
     // We expect that group to be added before '#' but after other groups.
-    typedef QtContactsSqliteExtensions::ContactManagerEngine EngineType;
-    EngineType *cme = dynamic_cast<EngineType *>(QContactManagerData::managerData(m_cm)->m_engine);
+    QtContactsSqliteExtensions::ContactManagerEngine *cme =
+        QtContactsSqliteExtensions::contactManagerEngine(*m_cm);
     const QStringList oldContactDisplayLabelGroups = cme->displayLabelGroups();
     QSignalSpy dlgcSpy(cme, SIGNAL(displayLabelGroupsChanged(QStringList)));