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/WebFetch.cpp | |
| parent | 713b92c3c233f8f38200c4a458e0196d3d39a3b0 (diff) | |
| parent | 15831dbca85dd906edbad2bfff2b147527a456e2 (diff) | |
Merge PR #3644: Don't include PCH headers directly, add missing includes
Diffstat (limited to 'src/mumble/WebFetch.cpp')
| -rw-r--r-- | src/mumble/WebFetch.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mumble/WebFetch.cpp b/src/mumble/WebFetch.cpp index b5266a54e..0b40c4261 100644 --- a/src/mumble/WebFetch.cpp +++ b/src/mumble/WebFetch.cpp @@ -3,13 +3,15 @@ // 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 "WebFetch.h" -#include "Global.h" #include "NetworkConfig.h" +#include <QtNetwork/QNetworkReply> + +// 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" + WebFetch::WebFetch(QString service, QUrl url, QObject *obj, const char *slot) : QObject() , qoObject(obj) |