Commit 90bde396 authored by camilo higuita's avatar camilo higuita

Merge branch 'development' of https://invent.kde.org/maui/communicator into development

parents 5166028a 572a8ba8
......@@ -18,10 +18,8 @@
#endif
#if defined Q_OS_MACOS || defined Q_OS_WIN
#include <KF5/KI18n/KLocalizedContext>
#include <KF5/KI18n/KLocalizedString>
#else
#include <KI18n/KLocalizedContext>
#include <KI18n/KLocalizedString>
#endif
......@@ -93,7 +91,6 @@ int main(int argc, char *argv[])
#ifdef STATIC_MAUIKIT
MauiKit::getInstance().registerTypes();
#endif
engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
engine.addImageProvider("contact", new ContactImage(QQuickImageProvider::ImageType::Image));
qmlRegisterType<ContactsModel>(COMMUNICATOR_URI, 1, 0, "ContactsList");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment