summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2022-04-13 00:40:56 +0200
committerKieran Bingham <kieran.bingham@ideasonboard.com>2022-07-18 23:18:03 +0100
commit260b0e1a4ced973f4e5274b3369367fd8cc89156 (patch)
treed333ee0e28b291188f7e0d8b414010df5eee3444
parent5ef59cd190e2193ac799cb9c3564dd7a484c1239 (diff)
qcam: main_window: Fix include ordering
Fix the sort order of the Qt headers to match the expected sort order from clang-format. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--src/qcam/main_window.cpp1
-rw-r--r--src/qcam/main_window.h17
2 files changed, 10 insertions, 8 deletions
diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp
index dd0e51f5..7433d647 100644
--- a/src/qcam/main_window.cpp
+++ b/src/qcam/main_window.cpp
@@ -29,6 +29,7 @@
#include <QtDebug>
#include "../cam/image.h"
+
#include "dng_writer.h"
#ifndef QT_NO_OPENGL
#include "viewfinder_gl.h"
diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h
index 3fbe872c..fc70920f 100644
--- a/src/qcam/main_window.h
+++ b/src/qcam/main_window.h
@@ -10,14 +10,6 @@
#include <memory>
#include <vector>
-#include <QElapsedTimer>
-#include <QIcon>
-#include <QMainWindow>
-#include <QMutex>
-#include <QObject>
-#include <QQueue>
-#include <QTimer>
-
#include <libcamera/camera.h>
#include <libcamera/camera_manager.h>
#include <libcamera/controls.h>
@@ -26,7 +18,16 @@
#include <libcamera/request.h>
#include <libcamera/stream.h>
+#include <QElapsedTimer>
+#include <QIcon>
+#include <QMainWindow>
+#include <QMutex>
+#include <QObject>
+#include <QQueue>
+#include <QTimer>
+
#include "../cam/stream_options.h"
+
#include "viewfinder.h"
class QAction;