Browse Source

fix: Fix incorrect headers order

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

Fixes #4220
reviewable/pr4257/r2
DX37 8 years ago
parent
commit
0fc3911318
  1. 6
      src/net/autoupdate.cpp
  2. 12
      src/platform/camera/directshow.cpp

6
src/net/autoupdate.cpp

@ -35,8 +35,12 @@ @@ -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

@ -21,14 +21,18 @@ @@ -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,

Loading…
Cancel
Save