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

Merge pull request #4257

Browse Source 
DX37 (1):
      fix: Fix incorrect headers order
This commit is contained in:
sudden6 2017-03-19 13:36:40 +01:00
commit b195ff5a66
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
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> #include <iostream>
#ifdef Q_OS_WIN #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 <windows.h>
#include <shellapi.h>
// clang-format on
#endif #endif
/** /**

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

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