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

90bde396 · camilo higuita · 5166028a · 572a8ba8 · 90bde396
Commit 90bde396 authored Nov 05, 2020 by camilo higuita
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

src/main.cpp src/main.cpp +0 -3

No files found.
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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");