diff --git a/AABB_tree/demo/AABB_tree/Viewer.cpp b/AABB_tree/demo/AABB_tree/Viewer.cpp
index 35b2496a69f..2f411def1df 100644
--- a/AABB_tree/demo/AABB_tree/Viewer.cpp
+++ b/AABB_tree/demo/AABB_tree/Viewer.cpp
@@ -5,7 +5,7 @@
 #include <CGAL/Qt/CreateOpenGLContext.h>
 
 Viewer::Viewer(QWidget* parent)
-  : QGLViewer(CGAL::Qt::createOpenGLContext(parent),parent),
+  : QGLViewer(CGAL::Qt::createOpenGLContext(),parent),
     m_pScene(NULL),
     m_custom_mouse(false)
 {
diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.cpp b/Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.cpp
index e1f2e029a66..a5a0dd2f222 100644
--- a/Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.cpp
+++ b/Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.cpp
@@ -5,7 +5,7 @@
 #include "CGAL/Qt/CreateOpenGLContext.h"
 
 Viewer::Viewer(QWidget* parent)
-  : QGLViewer(CGAL::Qt::createOpenGLContext(parent),parent)
+  : QGLViewer(CGAL::Qt::createOpenGLContext(),parent)
 {
   are_buffers_initialized = false;
 }
diff --git a/Circular_kernel_3/demo/Circular_kernel_3/Viewer.cpp b/Circular_kernel_3/demo/Circular_kernel_3/Viewer.cpp
index 413cbeca0e8..0036038b6de 100644
--- a/Circular_kernel_3/demo/Circular_kernel_3/Viewer.cpp
+++ b/Circular_kernel_3/demo/Circular_kernel_3/Viewer.cpp
@@ -7,7 +7,7 @@
 
 
 Viewer::Viewer(QWidget* parent )
-  : QGLViewer(CGAL::Qt::createOpenGLContext(parent),parent)
+  : QGLViewer(CGAL::Qt::createOpenGLContext(),parent)
 {
     extension_is_found = false;
 }
diff --git a/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h b/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
index d05c5904cc6..48799048e41 100644
--- a/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
+++ b/GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
@@ -23,9 +23,9 @@
 #include <QGLContext>
 namespace CGAL{
 namespace Qt{
-inline QGLContext* createOpenGLContext(QObject* parent)
+inline QGLContext* createOpenGLContext()
 {
-    QOpenGLContext *context = new QOpenGLContext(parent);
+    QOpenGLContext *context = new QOpenGLContext();
     QSurfaceFormat format;
     format.setVersion(2,1);
     format.setProfile(QSurfaceFormat::CompatibilityProfile);
@@ -35,9 +35,9 @@ inline QGLContext* createOpenGLContext(QObject* parent)
     return result;
 }
 
-inline QGLContext* createOpenGLMSAAContext(QObject* parent)
+inline QGLContext* createOpenGLMSAAContext()
 {
-    QOpenGLContext *context = new QOpenGLContext(parent);
+    QOpenGLContext *context = new QOpenGLContext();
     QSurfaceFormat format;
     format.setVersion(2,1);
     format.setProfile(QSurfaceFormat::CompatibilityProfile);
diff --git a/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp b/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
index 052dda15a5b..dca13ab0f40 100644
--- a/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
+++ b/Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
@@ -28,7 +28,7 @@
 #include <QDebug>
 
 Viewer::Viewer(QWidget* parent)
-  : QGLViewer(CGAL::Qt::createOpenGLMSAAContext(parent),parent), wireframe(false),
+  : QGLViewer(CGAL::Qt::createOpenGLMSAAContext(),parent), wireframe(false),
     flatShading(true), edges(true), vertices(true),
     m_previous_scene_empty(true), are_buffers_initialized(false)
 {
diff --git a/Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h b/Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
index e7f76033057..1a16423e537 100644
--- a/Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
+++ b/Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
@@ -153,8 +153,8 @@ class SimpleLCCViewerQt : public QGLViewer, public QOpenGLFunctions_2_1
 
 public:
   // Constructor/Destructor
-  SimpleLCCViewerQt(LCC& alcc, QObject* parent) :
-    QGLViewer(CGAL::Qt::createOpenGLContext(parent)),
+  SimpleLCCViewerQt(LCC& alcc) :
+    QGLViewer(CGAL::Qt::createOpenGLContext()),
     lcc(alcc),
     wireframe(false),
     flatShading(true),
diff --git a/Mesh_3/demo/Mesh_3/src/CGAL_demo/Viewer.cpp b/Mesh_3/demo/Mesh_3/src/CGAL_demo/Viewer.cpp
index 5df0afa2a13..908ed02fc38 100644
--- a/Mesh_3/demo/Mesh_3/src/CGAL_demo/Viewer.cpp
+++ b/Mesh_3/demo/Mesh_3/src/CGAL_demo/Viewer.cpp
@@ -3,7 +3,7 @@
 #include <CGAL/Qt/CreateOpenGLContext.h>
 
 Viewer::Viewer(QWidget* parent, bool antialiasing)
-  : QGLViewer(CGAL::Qt::createOpenGLContext(parent), parent),
+  : QGLViewer(CGAL::Qt::createOpenGLContext(), parent),
     scene(0),
     antialiasing(antialiasing),
     twosides(false),
diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Viewer.cpp b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Viewer.cpp
index ebb98bb5238..51521874203 100644
--- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Viewer.cpp
+++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Viewer.cpp
@@ -2,7 +2,7 @@
  #include <CGAL/Qt/CreateOpenGLContext.h>
 
 Viewer::Viewer(QWidget *parent)
-: QGLViewer(CGAL::Qt::createOpenGLContext(parent),parent)
+: QGLViewer(CGAL::Qt::createOpenGLContext(),parent)
 {}
 Viewer::~Viewer()
 {}
diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Viewer.h b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Viewer.h
index bf2fc24c863..c03df5c5c65 100644
--- a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Viewer.h
+++ b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Viewer.h
@@ -22,7 +22,7 @@ class Viewer : public QGLViewer, QOpenGLFunctions_2_1 {
   int nr_of_facets;
 public:
   Viewer(QWidget* parent)
-    : QGLViewer(CGAL::Qt::createOpenGLContext(parent), parent)
+    : QGLViewer(CGAL::Qt::createOpenGLContext(), parent)
   {}
   ~Viewer()
   {
diff --git a/Three/include/CGAL/Three/Viewer_interface.h b/Three/include/CGAL/Three/Viewer_interface.h
index d6e0a2ca4b7..e99b5bbd785 100644
--- a/Three/include/CGAL/Three/Viewer_interface.h
+++ b/Three/include/CGAL/Three/Viewer_interface.h
@@ -64,7 +64,7 @@ public:
    NB_OF_PROGRAMS               /** Holds the number of different programs in this enum.*/
   };
 
-  Viewer_interface(QWidget* parent) : QGLViewer(CGAL::Qt::createOpenGLContext(parent), parent) {}
+  Viewer_interface(QWidget* parent) : QGLViewer(CGAL::Qt::createOpenGLContext(), parent) {}
   virtual ~Viewer_interface() {}
 
   //! Sets the scene for the viewer.
diff --git a/Triangulation_3/demo/Triangulation_3/Viewer.h b/Triangulation_3/demo/Triangulation_3/Viewer.h
index ca4362ec0c7..c865f018a41 100644
--- a/Triangulation_3/demo/Triangulation_3/Viewer.h
+++ b/Triangulation_3/demo/Triangulation_3/Viewer.h
@@ -24,7 +24,7 @@ class Viewer : public QGLViewer, QOpenGLFunctions_2_1 {
 
 public:
   Viewer(QWidget* parent)
-    : QGLViewer(CGAL::Qt::createOpenGLContext(parent),parent)
+    : QGLViewer(CGAL::Qt::createOpenGLContext(),parent)
     , m_showAxis(false)
     , m_showVertex(true)
     , m_showDEdge(true)