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

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

View file

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

View file

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