From aaa41bf9193b943a4f51c5ef823b3b305c8ccdae Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 14 Mar 2022 15:24:10 +0100 Subject: [PATCH] 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 --- src/Gui/Quarter/QuarterWidgetP.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Gui/Quarter/QuarterWidgetP.cpp b/src/Gui/Quarter/QuarterWidgetP.cpp index ad46e9449f..ea59fc0fb2 100644 --- a/src/Gui/Quarter/QuarterWidgetP.cpp +++ b/src/Gui/Quarter/QuarterWidgetP.cpp @@ -34,6 +34,10 @@ #pragma warning(disable : 4267) #endif +#include "QuarterWidgetP.h" +#include "QuarterWidget.h" +#include "eventhandlers/EventFilter.h" + #include #include #include @@ -48,12 +52,9 @@ #include #include -#include "QuarterWidgetP.h" #include "ContextMenu.h" #include "NativeEvent.h" #include "QuarterP.h" -#include "QuarterWidget.h" -#include "eventhandlers/EventFilter.h" using namespace SIM::Coin3D::Quarter;