From Kristofer Tingdahl, with additions from Riccardo Corsi and Robert Milharcic, support for Qt5 build
This commit is contained in:
@@ -14,11 +14,11 @@
|
||||
#ifndef OSGVIEWER_GRAPHICSWINDOWQT
|
||||
#define OSGVIEWER_GRAPHICSWINDOWQT
|
||||
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtCore/QEvent>
|
||||
#include <QtCore/QQueue>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtOpenGL/QGLWidget>
|
||||
#include <QMutex>
|
||||
#include <QEvent>
|
||||
#include <QQueue>
|
||||
#include <QSet>
|
||||
#include <QGLWidget>
|
||||
|
||||
#include <osgViewer/GraphicsWindow>
|
||||
#include <osgQt/Export>
|
||||
|
||||
@@ -18,12 +18,12 @@
|
||||
#include <osg/observer_ptr>
|
||||
#include <osgQt/Export>
|
||||
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtGui/QGraphicsScene>
|
||||
#include <QtGui/QGraphicsView>
|
||||
#include <QtGui/QApplication>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QtEvents>
|
||||
#include <QPointer>
|
||||
#include <QGraphicsScene>
|
||||
#include <QGraphicsView>
|
||||
#include <QApplication>
|
||||
#include <QPainter>
|
||||
#include <QtEvents>
|
||||
|
||||
namespace osgQt
|
||||
{
|
||||
|
||||
@@ -17,7 +17,12 @@
|
||||
// make sure this header isn't built as par of osgQt, leaving it to applications to build
|
||||
#if !defined(OSGQT_LIBRARY) && !defined(OSG_LIBRARY_STATIC)
|
||||
|
||||
#include <QtWebKit/QtWebKit>
|
||||
#if QT_VERSION >= 0x050000
|
||||
# include <QtWebKitWidgets>
|
||||
#else
|
||||
# include <QtWebKit>
|
||||
#endif
|
||||
|
||||
|
||||
#include <osgWidget/Browser>
|
||||
#include <osgQt/QGraphicsViewAdapter>
|
||||
|
||||
Reference in New Issue
Block a user