From 12a020cd0992d81438f4e36be7c3d5c1cea45f31 Mon Sep 17 00:00:00 2001 From: John Preston <johnprestonmail@gmail.com> Date: Sun, 8 Sep 2019 23:15:42 +0300 Subject: [PATCH] Beta version 1.8.5: Fix build for Linux. --- .../platform/linux/file_utilities_linux.cpp | 2 ++ .../SourceFiles/platform/linux/file_utilities_linux.h | 3 +++ .../SourceFiles/platform/linux/linux_gdk_helper.h | 2 ++ Telegram/SourceFiles/platform/linux/linux_libs.h | 3 +++ .../SourceFiles/platform/linux/main_window_linux.cpp | 4 +++- .../SourceFiles/platform/linux/specific_linux.cpp | 11 ++++++----- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp index 3b6ae7312..17dda4e49 100644 --- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp @@ -14,6 +14,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwindow.h" #include "storage/localstorage.h" +#include <QtCore/QProcess> + QStringList qt_make_filter_list(const QString &filter); namespace Platform { diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h index 7d97bd010..cd15bcdd9 100644 --- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h +++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h @@ -9,6 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/platform_file_utilities.h" +#include <QtGui/QWindow> +#include <QtWidgets/QFileDialog> + extern "C" { #undef signals #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION diff --git a/Telegram/SourceFiles/platform/linux/linux_gdk_helper.h b/Telegram/SourceFiles/platform/linux/linux_gdk_helper.h index af331f179..a7efb5685 100644 --- a/Telegram/SourceFiles/platform/linux/linux_gdk_helper.h +++ b/Telegram/SourceFiles/platform/linux/linux_gdk_helper.h @@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include <QtCore/QObject> +class QLibrary; + #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION extern "C" { #undef signals diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h index 8f9a241e7..95426829e 100644 --- a/Telegram/SourceFiles/platform/linux/linux_libs.h +++ b/Telegram/SourceFiles/platform/linux/linux_libs.h @@ -7,7 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include <QtCore/QLibrary> + #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION + extern "C" { #undef signals #ifdef TDESKTOP_USE_AYATANA_INDICATORS diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp index ebd393441..9ee34beed 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -16,8 +16,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "lang/lang_keys.h" #include "storage/localstorage.h" -#include <vector> + #include <QtDBus> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> namespace Platform { namespace { diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 35a9d2710..8e854fd0b 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -18,7 +18,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/crash_reports.h" #include "core/update_checker.h" -#include <QtGui/QGuiApplication> +#include <QtWidgets/QApplication> +#include <QtWidgets/QDesktopWidget> +#include <QtCore/QStandardPaths> +#include <QtCore/QProcess> +#include <QtCore/QVersionNumber> +#include <qpa/qplatformnativeinterface.h> #include <sys/stat.h> #include <sys/types.h> @@ -28,10 +33,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include <pwd.h> #include <iostream> -#include <QProcess> -#include <QVersionNumber> - -#include <qpa/qplatformnativeinterface.h> using namespace Platform; using Platform::File::internal::EscapeShell;