From 6ffc8d3905447a788ef139bd41ecc20f3c5797f2 Mon Sep 17 00:00:00 2001
From: crackedmind <digital.stream.of.mind@gmail.com>
Date: Wed, 20 Dec 2017 05:30:47 +0300
Subject: [PATCH] Remove Qt plugins path rewriting

---
 Telegram/CMakeLists.txt                   | 1 -
 Telegram/Resources/etc/qt_linux.conf      | 2 --
 Telegram/Resources/qrc/telegram_linux.qrc | 5 -----
 Telegram/SourceFiles/main.cpp             | 6 +-----
 4 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 Telegram/Resources/etc/qt_linux.conf
 delete mode 100644 Telegram/Resources/qrc/telegram_linux.qrc

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index f76399cb5..53779110c 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -514,7 +514,6 @@ if (LINUX)
         SourceFiles/platform/linux/notifications_manager_linux.cpp
         SourceFiles/platform/linux/specific_linux.cpp
     )
-    set(tg_RESOURCES Resources/qrc/telegram_linux.qrc)
 endif()
 
 list(APPEND tg_RESOURCES
diff --git a/Telegram/Resources/etc/qt_linux.conf b/Telegram/Resources/etc/qt_linux.conf
deleted file mode 100644
index 6d80862b5..000000000
--- a/Telegram/Resources/etc/qt_linux.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Paths]
-Libraries=:/gui/art
diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc
deleted file mode 100644
index 0554fa179..000000000
--- a/Telegram/Resources/qrc/telegram_linux.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-  <qresource prefix="/qt">
-    <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
-  </qresource>
-</RCC>
diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
index 02e9c27b7..6e28040a0 100644
--- a/Telegram/SourceFiles/main.cpp
+++ b/Telegram/SourceFiles/main.cpp
@@ -39,11 +39,7 @@ int main(int argc, char *argv[]) {
 	// both are finished in Application::closeApplication
 	Logs::start(); // must be started before Platform is started
 	Platform::start(); // must be started before QApplication is created
-#if defined(Q_OS_LINUX64)
-	QCoreApplication::addLibraryPath("/usr/lib64/qt5/plugins");
-#else
-	QCoreApplication::addLibraryPath("/usr/lib/qt5/plugins");
-#endif
+
 	qputenv("QT_STYLE_OVERRIDE", "qwerty");
 	qunsetenv("QT_QPA_PLATFORMTHEME");