Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:19:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #6271 from sethalves/fix-seths-build

Browse source 
get interface building on seth's linux box
This commit is contained in:
Andrew Meadows 2015-11-02 11:02:08 -08:00
commit 9b1b009b8b
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gl/src/gl/GlWindow.h
View file

@ -11,7 +11,7 @@
#define hifi_GlWindow_h #define hifi_GlWindow_h
#include <mutex> #include <mutex>
#include <QWindow> #include <QtGui/QWindow>
class QOpenGLContext; class QOpenGLContext;
class QOpenGLDebugLogger; class QOpenGLDebugLogger;

12
plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
View file

@ -9,15 +9,15 @@
#include <memory> #include <memory>
#include <QMainWindow> #include <QtWidgets/QMainWindow>
#include <QGLWidget> #include <QtOpenGL/QGLWidget>
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include <gl/GlWindow.h> #include <gl/GlWindow.h>
#include <QEvent> #include <QEvent>
#include <QResizeEvent> #include <QtGui/QResizeEvent>
#include <QOpenGLContext> #include <QtGui/QOpenGLContext>
#include <QGuiApplication> #include <QtGui/QGuiApplication>
#include <QScreen> #include <QtGui/QScreen>
#include <PerfStat.h> #include <PerfStat.h>
#include <gl/OglplusHelpers.h> #include <gl/OglplusHelpers.h>