Merge branch 'master' into featureSeparateGlew

a54cfc6a · Martin Schultz · 0a0b7e73 · 7cd7dcb5 · a54cfc6a
Commit a54cfc6a authored Mar 19, 2018 by Martin Schultz
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

QtWidgetNode.cc ObjectTypes/QtWidget/QtWidgetNode.cc +3 -3

No files found.
--- a/ObjectTypes/QtWidget/QtWidgetNode.cc
+++ b/ObjectTypes/QtWidget/QtWidgetNode.cc
@@ -46,15 +46,15 @@
 *   $Date$                   *
 *                                                                           *
 \*===========================================================================*/
-
-#include <ACG/GL/acg_glew.hh>
 #include "QtWidgetNode.hh"
+#include <QGLWidget>
+#include <ACG/GL/acg_glew.hh>
 #include <ACG/Geometry/Types/PlaneT.hh>
 #include <ACG/Utils/ImageConversion.hh>

 #include <QApplication>

-#include <QGLWidget>
+


 //== NAMESPACES ===============================================================