Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/mumble/MumbleApplication.cpp')
-rw-r--r--src/mumble/MumbleApplication.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mumble/MumbleApplication.cpp b/src/mumble/MumbleApplication.cpp
index 902e0609a..c338fc805 100644
--- a/src/mumble/MumbleApplication.cpp
+++ b/src/mumble/MumbleApplication.cpp
@@ -3,19 +3,21 @@
// 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 "MumbleApplication.h"
#include "MainWindow.h"
#include "GlobalShortcut.h"
-#include "Global.h"
#include "EnvUtils.h"
#if defined(Q_OS_WIN)
# include "GlobalShortcut_win.h"
#endif
+#include <QtGui/QFileOpenEvent>
+
+// 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.
+#include "Global.h"
+
MumbleApplication *MumbleApplication::instance() {
return static_cast<MumbleApplication *>(QCoreApplication::instance());
}