diff options
Diffstat (limited to 'src/OSInfo.cpp')
| -rw-r--r-- | src/OSInfo.cpp | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/src/OSInfo.cpp b/src/OSInfo.cpp index 79284d1a7..55e6ddb8c 100644 --- a/src/OSInfo.cpp +++ b/src/OSInfo.cpp @@ -3,30 +3,41 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at <https://www.mumble.info/LICENSE>. -#include "murmur_pch.h" +#include <QtCore/QtGlobal> #if defined(Q_OS_WIN) -#include <intrin.h> +# include "win.h" +#endif + +#include "OSInfo.h" + +#include "Version.h" + +#include <QtCore/QCryptographicHash> +#include <QtCore/QProcess> +#include <QtNetwork/QNetworkInterface> +#include <QtXml/QDomDocument> + +#if defined(Q_OS_WIN) +# include <intrin.h> #endif #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) -#include <sys/utsname.h> +# include <sys/utsname.h> #endif #if defined(Q_OS_MAC) -#include <sys/types.h> -#include <sys/sysctl.h> -#include <mach-o/arch.h> +# include <Carbon/Carbon.h> +# include <sys/types.h> +# include <sys/sysctl.h> +# include <mach-o/arch.h> // Ignore deprecation warnings for Gestalt. // See mumble-voip/mumble#3290 for more information. -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#include "OSInfo.h" -#include "Version.h" - #if defined(Q_OS_WIN) // regString converts a wchar_t string of size to a // QString. If the string contains a NUL value, that |