From d42e757576543f31b0cc9ac4cab74ca7f9da1370 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 12 Feb 2020 10:48:19 +0100
Subject: [PATCH] [libcalamares] Simplify includes

 - CalamaresVersion used by the job, not the API presented to Python.
 - Untangle Qt includes from there.
---
 src/libcalamares/PythonJob.cpp  | 1 +
 src/libcalamares/PythonJobApi.h | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp
index bff7fcc74..f5c033826 100644
--- a/src/libcalamares/PythonJob.cpp
+++ b/src/libcalamares/PythonJob.cpp
@@ -19,6 +19,7 @@
 
 #include "PythonJob.h"
 
+#include "CalamaresVersion.h"
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "PythonHelper.h"
diff --git a/src/libcalamares/PythonJobApi.h b/src/libcalamares/PythonJobApi.h
index 981527951..80a32b930 100644
--- a/src/libcalamares/PythonJobApi.h
+++ b/src/libcalamares/PythonJobApi.h
@@ -20,9 +20,7 @@
 #ifndef PYTHONJOBAPI_H
 #define PYTHONJOBAPI_H
 
-#include "CalamaresVersion.h"
-
-#include "PythonJob.h"
+#include "qglobal.h"  // For qreal
 
 #undef slots
 #include "utils/boost-warnings.h"
@@ -32,6 +30,11 @@
 #pragma clang diagnostic pop
 #endif
 
+namespace Calamares
+{
+class PythonJob;
+}
+
 namespace CalamaresPython
 {