mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Glew Qt5 Fix for VizFramework
This commit is contained in:
@@ -44,6 +44,8 @@
|
||||
#include "cvfShaderSourceProvider.h"
|
||||
#include "cvfqtUtils.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QMessageBox>
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -43,6 +43,17 @@
|
||||
|
||||
#include "cvfqtUtils.h"
|
||||
|
||||
#include <QAction>
|
||||
#include <QDockWidget>
|
||||
#include <QFrame>
|
||||
#include <QKeyEvent>
|
||||
#include <QInputDialog>
|
||||
#include <QLayout>
|
||||
#include <QMenu>
|
||||
#include <QMenuBar>
|
||||
#include <QMessageBox>
|
||||
#include <QMouseEvent>
|
||||
|
||||
using cvfu::TestSnippet;
|
||||
using cvfu::SnippetInfo;
|
||||
using cvfu::SnippetRegistry;
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
#include <QtGui/QMainWindow>
|
||||
#endif
|
||||
|
||||
|
||||
class QAction;
|
||||
class QSRSnippetWidget;
|
||||
class QSRRunPanel;
|
||||
class QSRPropertiesPanel;
|
||||
|
||||
@@ -43,6 +43,8 @@
|
||||
#include "cvfqtUtils.h"
|
||||
|
||||
#if QT_VERSION >= 0x050000
|
||||
#include <QComboBox>
|
||||
#include <QSpinBox>
|
||||
#include <QTextBrowser>
|
||||
#include <QListWidget>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
@@ -44,6 +44,9 @@
|
||||
#include "cvfqtUtils.h"
|
||||
|
||||
#if QT_VERSION >= 0x050000
|
||||
#include <QApplication>
|
||||
#include <QComboBox>
|
||||
#include <QDockWidget>
|
||||
#include <QGridLayout>
|
||||
#include <QLabel>
|
||||
#include <QPushButton>
|
||||
|
||||
@@ -44,6 +44,8 @@
|
||||
|
||||
#include <math.h>
|
||||
|
||||
#include <QMouseEvent>
|
||||
|
||||
using cvfu::TestSnippet;
|
||||
|
||||
|
||||
|
||||
@@ -1,23 +1,24 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <glew/GL/glew.h>
|
||||
#include <QtCore/QtCore>
|
||||
#if QT_VERSION >= 0x050000
|
||||
#include <QtWidgets>
|
||||
#else
|
||||
#include <QtGui/QtGui>
|
||||
#endif
|
||||
|
||||
#include "cvfLibCore.h"
|
||||
#include "cvfLibRender.h"
|
||||
#include "cvfLibGeometry.h"
|
||||
#include "cvfLibViewing.h"
|
||||
#include "cvfOpenGL.h"
|
||||
|
||||
#include "cvfuTestSnippet.h"
|
||||
#include "cvfuSnippetFactory.h"
|
||||
#include "cvfuInputEvents.h"
|
||||
|
||||
#include <QtCore/QtCore>
|
||||
#if QT_VERSION >= 0x050000
|
||||
#include <QObject>
|
||||
#include <QPointer>
|
||||
#include <QWidget>
|
||||
#else
|
||||
#include <QtGui/QtGui>
|
||||
#endif
|
||||
|
||||
// Introduce name of commonly used classes (that are unlikely to create clashes) from the cvf namespace.
|
||||
// We allow the use of using-declarations in this include file since its sole usage is as a precompiled header file.
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
#include "QSRStdInclude.h"
|
||||
#include "QSRTranslateEvent.h"
|
||||
|
||||
|
||||
#include <QMouseEvent>
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
|
||||
Reference in New Issue
Block a user