Remove Qt plugins path rewriting

procxx · Dec 20, 2017 · 6ffc8d3 · 6ffc8d3
1 parent 59ee61a
commit 6ffc8d3
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 deletions.
diff --git 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
diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc
diff --git 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");