diff options
Diffstat (limited to 'src/mumble/main.cpp')
-rw-r--r-- | src/mumble/main.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp index 00ed08d22..ecc93d55e 100644 --- a/src/mumble/main.cpp +++ b/src/mumble/main.cpp @@ -15,16 +15,15 @@ #include "Plugins.h" #include "LogEmitter.h" #include "DeveloperConsole.h" -#include "Global.h" #include "LCD.h" #ifdef USE_BONJOUR -#include "BonjourClient.h" +# include "BonjourClient.h" #endif #ifdef USE_DBUS -#include "DBus.h" +# include "DBus.h" #endif #ifdef USE_VLD -#include "vld.h" +# include "vld.h" #endif #include "VersionCheck.h" #include "NetworkConfig.h" @@ -38,10 +37,24 @@ #include "License.h" #include "EnvUtils.h" +#include <QtCore/QLibraryInfo> +#include <QtCore/QProcess> +#include <QtCore/QStandardPaths> +#include <QtCore/QTranslator> +#include <QtGui/QDesktopServices> +#include <QtWidgets/QMessageBox> + +#ifdef USE_DBUS +# include <QtDBus/QDBusInterface> +#endif + #if defined(Q_OS_WIN) && defined(QT_NO_DEBUG) -#include <shellapi.h> // For CommandLineToArgvW() +# include <shellapi.h> // For CommandLineToArgvW() #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. +#include "Global.h" + #if defined(USE_STATIC_QT_PLUGINS) && QT_VERSION < 0x050000 Q_IMPORT_PLUGIN(qtaccessiblewidgets) # ifdef Q_OS_WIN |