Gui: [skip ci] change include order to avoid warnings with MSVC
* QtGui/qopenglext.h(11119,1): warning C4005: 'GL_OFFSET_TEXTURE_2D_MATRIX_NV': macro redefinition * QtGui/qopenglext.h(11120,1): warning C4005: 'GL_OFFSET_TEXTURE_2D_SCALE_NV': macro redefinition * QtGui/qopenglext.h(11121,1): warning C4005: 'GL_OFFSET_TEXTURE_2D_BIAS_NV': macro redefinition
This commit is contained in:
@@ -34,6 +34,10 @@
|
||||
#pragma warning(disable : 4267)
|
||||
#endif
|
||||
|
||||
#include "QuarterWidgetP.h"
|
||||
#include "QuarterWidget.h"
|
||||
#include "eventhandlers/EventFilter.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCursor>
|
||||
#include <QMenu>
|
||||
@@ -48,12 +52,9 @@
|
||||
#include <Inventor/scxml/SoScXMLStateMachine.h>
|
||||
#include <Inventor/C/glue/gl.h>
|
||||
|
||||
#include "QuarterWidgetP.h"
|
||||
#include "ContextMenu.h"
|
||||
#include "NativeEvent.h"
|
||||
#include "QuarterP.h"
|
||||
#include "QuarterWidget.h"
|
||||
#include "eventhandlers/EventFilter.h"
|
||||
|
||||
|
||||
using namespace SIM::Coin3D::Quarter;
|
||||
|
||||
Reference in New Issue
Block a user