StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix: Fix incorrect headers order

Browse Source 
Because of incorrect order, qTox on Windows can't be compiled properly.

Fixes #4220
This commit is contained in:
DX37 2017-03-18 17:34:23 +06:00
parent a3e646182a
commit 0fc3911318
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/autoupdate.cpp
View File

@ -35,8 +35,12 @@
#include <iostream>
#ifdef Q_OS_WIN
#include <shellapi.h>
// Because of replacing to incorrect order, which leads to building failing,
// this region is ignored for clang-format
// clang-format off
#include <windows.h>
#include <shellapi.h>
// clang-format on
#endif
/**

12
src/platform/camera/directshow.cpp
View File

@ -21,14 +21,18 @@
#include "directshow.h"
#include <QDebug>
#include <amvideo.h>
#include <cassert>
// Because of replacing to incorrect order, which leads to building failing,
// this region is ignored for clang-format
// clang-format off
#include <cstdint>
#include <dvdmedia.h>
#include <objbase.h>
#include <strmif.h>
#include <amvideo.h>
#include <dvdmedia.h>
#include <uuids.h>
#include <cassert>
#include <QDebug>
// clang-format on
/**
* Most of this file is adapted from libavdevice's dshow.c,