From 9c34be2427a483d3bf5f115eac28dec2716461f2 Mon Sep 17 00:00:00 2001
From: DaMichel <mw.pub@welter-4d.de>
Date: Sun, 7 Aug 2016 09:59:32 +0200
Subject: Fix trivial build errors on linux. Also support Qt 5.5.

---
 cv/camera-dialog.cpp | 2 ++
 cv/camera-dialog.hpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'cv')

diff --git a/cv/camera-dialog.cpp b/cv/camera-dialog.cpp
index 05161cb1..f2cdf9db 100644
--- a/cv/camera-dialog.cpp
+++ b/cv/camera-dialog.cpp
@@ -20,12 +20,14 @@ void camera_dialog::maybe_grab_frame(cv::VideoCapture& cap)
     }
 }
 
+#ifdef _WIN32
 void camera_dialog::init_com_threading()
 {
     HRESULT hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
     if (FAILED(hr))
         qDebug() << "failed CoInitializeEx" << hr << "code" << GetLastError();
 }
+#endif
 
 camera_dialog::~camera_dialog() {}
 
diff --git a/cv/camera-dialog.hpp b/cv/camera-dialog.hpp
index 08462e92..15ae2bc9 100644
--- a/cv/camera-dialog.hpp
+++ b/cv/camera-dialog.hpp
@@ -16,13 +16,13 @@
 #endif
 
 #ifdef _WIN32
-#   include <opencv2/videoio.hpp>
 #   include <QTimer>
 #   include <objbase.h>
 #   include <winerror.h>
 #   include <windows.h>
 #endif
 
+#include <opencv2/videoio.hpp>
 #include <QMutex>
 
 class camera_dialog
-- 
cgit v1.2.3