fly/flightgear
1
0
Fork 0
Code Activity

Fix an error with new OSG compilation

Browse source 
Ensure we include <QOpenGLContext> before any OSG headers
This commit is contained in:
James Turner 2021-05-19 15:10:17 +01:00
parent 804f689da8
commit d5789b5f74
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/GUI/OSGQtAdaption.cxx
View file

@ -16,11 +16,12 @@
#include "config.h" #include "config.h"
#include <QOpenGLContext>
#include "OSGQtAdaption.hxx" #include "OSGQtAdaption.hxx"
#include <memory> #include <memory>
#include <QOpenGLContext>
#include <QWindow> #include <QWindow>
#include <QThread> #include <QThread>

3
src/GUI/QQuickDrawable.cxx
View file

@ -21,6 +21,8 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <atomic> #include <atomic>
#include <QOpenGLContext>
#include "QQuickDrawable.hxx" #include "QQuickDrawable.hxx"
#include <QQmlComponent> #include <QQmlComponent>
@ -30,7 +32,6 @@
#include <QTimer> #include <QTimer>
#include <QCoreApplication> #include <QCoreApplication>
#include <QOpenGLContext>
#include <QOpenGLFunctions> #include <QOpenGLFunctions>
#include <QQuickItem> #include <QQuickItem>
#include <QQuickWindow> #include <QQuickWindow>