diff options
| author | Davide Beatrici <davidebeatrici@gmail.com> | 2019-09-12 23:44:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 23:44:16 +0300 |
| commit | a38d19a7595c3e672f5ed549400b36348e01e442 (patch) | |
| tree | 34bd1c4db9b95748d263aea811e849dec7e5525c /src/mumble/MainWindow.cpp | |
| parent | 713b92c3c233f8f38200c4a458e0196d3d39a3b0 (diff) | |
| parent | 15831dbca85dd906edbad2bfff2b147527a456e2 (diff) | |
Merge PR #3644: Don't include PCH headers directly, add missing includes
Diffstat (limited to 'src/mumble/MainWindow.cpp')
| -rw-r--r-- | src/mumble/MainWindow.cpp | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index eeb62d263..83911c152 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at <https://www.mumble.info/LICENSE>. -#include "mumble_pch.hpp" - #include "MainWindow.h" #include "About.h" @@ -47,13 +45,32 @@ #include "SSLCipherInfo.h" #include "Screen.h" #include "SvgIcon.h" +#include "Utils.h" #ifdef Q_OS_WIN -#include "TaskList.h" +# include "TaskList.h" #endif #ifdef Q_OS_MAC -#include "AppNap.h" +# include "AppNap.h" +#endif + +#include <QtCore/QStandardPaths> +#include <QtCore/QUrlQuery> +#include <QtGui/QClipboard> +#include <QtGui/QDesktopServices> +#include <QtGui/QImageReader> +#include <QtGui/QScreen> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QInputDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QScrollBar> +#include <QtWidgets/QToolTip> +#include <QtWidgets/QWhatsThis> + +#ifdef Q_OS_WIN +# include <dbt.h> #endif // We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include. |