From d5789b5f743466cc40ffdc1b242799dd39f56b76 Mon Sep 17 00:00:00 2001
From: James Turner <james@flightgear.org>
Date: Wed, 19 May 2021 15:10:17 +0100
Subject: [PATCH] Fix an error with new OSG compilation

Ensure we include <QOpenGLContext> before any OSG headers
---
 src/GUI/OSGQtAdaption.cxx  | 3 ++-
 src/GUI/QQuickDrawable.cxx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/GUI/OSGQtAdaption.cxx b/src/GUI/OSGQtAdaption.cxx
index d21670476..fdd9c6c5c 100644
--- a/src/GUI/OSGQtAdaption.cxx
+++ b/src/GUI/OSGQtAdaption.cxx
@@ -16,11 +16,12 @@
 
 #include "config.h"
 
+#include <QOpenGLContext>
+
 #include "OSGQtAdaption.hxx"
 
 #include <memory>
 
-#include <QOpenGLContext>
 #include <QWindow>
 #include <QThread>
 
diff --git a/src/GUI/QQuickDrawable.cxx b/src/GUI/QQuickDrawable.cxx
index 16f437879..179a1b429 100755
--- a/src/GUI/QQuickDrawable.cxx
+++ b/src/GUI/QQuickDrawable.cxx
@@ -21,6 +21,8 @@
 #include <simgear/compiler.h>
 #include <atomic>
 
+#include <QOpenGLContext>
+
 #include "QQuickDrawable.hxx"
 
 #include <QQmlComponent>
@@ -30,7 +32,6 @@
 
 #include <QTimer>
 #include <QCoreApplication>
-#include <QOpenGLContext>
 #include <QOpenGLFunctions>
 #include <QQuickItem>
 #include <QQuickWindow>