diff --git a/GraphicsView/demo/Circular_kernel_2/ArcsGraphicsItem.h b/GraphicsView/demo/Circular_kernel_2/ArcsGraphicsItem.h
index 028ba1e442f..03a594a2b45 100644
--- a/GraphicsView/demo/Circular_kernel_2/ArcsGraphicsItem.h
+++ b/GraphicsView/demo/Circular_kernel_2/ArcsGraphicsItem.h
@@ -116,10 +116,10 @@ ArcsGraphicsItem<CK>::paint(QPainter *painter,
     Line_arc_2 la;
 
     if(assign(cap_ui, *it)){
-      QMatrix matrix = painter->matrix();
-      painter->resetMatrix();
+      QTransform matrix = painter->worldTransform();
+      painter->resetTransform();
       painter->drawPoint(matrix.map(convert(cap_ui.first)));
-      painter->setMatrix(matrix);
+      painter->setWorldTransform(matrix);
     }if(assign(ca, *it)){
       painterostream << ca;
     } else if(assign(la, *it)){
diff --git a/GraphicsView/demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h b/GraphicsView/demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h
index 5c2648a5284..b8e1268e943 100644
--- a/GraphicsView/demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h
+++ b/GraphicsView/demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h
@@ -223,8 +223,8 @@ namespace CGAL {
         
         Converter<Geom_traits> convert;
 
-        QMatrix matrix = painter->matrix();
-        painter->resetMatrix();
+        QTransform matrix = painter->worldTransform();
+        painter->resetTransform();
 
         { // Faces
           painter->setPen(QPen());
@@ -254,7 +254,7 @@ namespace CGAL {
           }
         }
 
-        painter->setMatrix(matrix);
+        painter->setWorldTransform(matrix);
       }      
 
       if(visibleEdges()) {
@@ -272,8 +272,8 @@ namespace CGAL {
       if(visibleVertices()) {
         Converter<Geom_traits> convert;
         
-        QMatrix matrix = painter->matrix();
-        painter->resetMatrix();
+        QTransform matrix = painter->worldTransform();
+        painter->resetTransform();
 
         QPen pen = verticesPen();
         if (t->number_of_vertices() < 8) {
@@ -301,7 +301,7 @@ namespace CGAL {
             }
         }
 
-        painter->setMatrix(matrix);
+        painter->setWorldTransform(matrix);
       }
     }
     
@@ -312,10 +312,10 @@ namespace CGAL {
       Converter<Geom_traits> convert;
       
       m_painter->setPen(this->verticesPen());
-      QMatrix matrix = m_painter->matrix();
-      m_painter->resetMatrix();
+      QTransform matrix = m_painter->worldTransform();
+      m_painter->resetTransform();
       m_painter->drawPoint(matrix.map(convert(point)));
-      m_painter->setMatrix(matrix);
+      m_painter->setWorldTransform(matrix);
     }
     
     template <typename T>
@@ -325,10 +325,10 @@ namespace CGAL {
       Converter<Geom_traits> convert;
       
       m_painter->setPen(this->verticesPen());
-      QMatrix matrix = m_painter->matrix();
-      m_painter->resetMatrix();
+      QTransform matrix = m_painter->worldTransform();
+      m_painter->resetTransform();
       m_painter->drawPoint(matrix.map(convert(vh->point())));
-      m_painter->setMatrix(matrix);
+      m_painter->setWorldTransform(matrix);
     }
     
     template <typename T>
diff --git a/GraphicsView/include/CGAL/Qt/AlphaShapeGraphicsItem.h b/GraphicsView/include/CGAL/Qt/AlphaShapeGraphicsItem.h
index 8a0fa3d212e..884991deb13 100644
--- a/GraphicsView/include/CGAL/Qt/AlphaShapeGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/AlphaShapeGraphicsItem.h
@@ -242,8 +242,8 @@ AlphaShapeGraphicsItem<T>::paintVertices(QPainter *painter)
     Converter<Geom_traits> convert;
 
     painter->setPen(verticesPen());
-    QMatrix matrix = painter->matrix();
-    painter->resetMatrix();
+    QTransform matrix = painter->worldTransform();
+    painter->resetTransform();
     for(typename T::Finite_vertices_iterator it = t->finite_vertices_begin();
         it != t->finite_vertices_end();
         it++){
@@ -260,10 +260,10 @@ AlphaShapeGraphicsItem<T>::paintOneVertex(const typename T::Point& point)
   Converter<Geom_traits> convert;
 
   m_painter->setPen(this->verticesPen());
-  QMatrix matrix = m_painter->matrix();
-  m_painter->resetMatrix();
+  QTransform matrix = m_painter->worldTransform();
+  m_painter->resetTransform();
   m_painter->drawPoint(matrix.map(convert(point)));
-  m_painter->setMatrix(matrix);
+  m_painter->setWorldTransform(matrix);
 }
 
 template <typename T>
@@ -273,10 +273,10 @@ AlphaShapeGraphicsItem<T>::paintVertex(typename T::Vertex_handle vh)
   Converter<Geom_traits> convert;
 
   m_painter->setPen(this->verticesPen());
-  QMatrix matrix = m_painter->matrix();
-  m_painter->resetMatrix();
+  QTransform matrix = m_painter->worldTransform();
+  m_painter->resetTransform();
   m_painter->drawPoint(matrix.map(convert(vh->point())));
-  m_painter->setMatrix(matrix);
+  m_painter->setWorldTransform(matrix);
 }
 
 template <typename T>
diff --git a/GraphicsView/include/CGAL/Qt/DelaunayMeshTriangulationGraphicsItem.h b/GraphicsView/include/CGAL/Qt/DelaunayMeshTriangulationGraphicsItem.h
index ce738f10251..525f18db1a0 100644
--- a/GraphicsView/include/CGAL/Qt/DelaunayMeshTriangulationGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/DelaunayMeshTriangulationGraphicsItem.h
@@ -265,14 +265,14 @@ DelaunayMeshTriangulationGraphicsItem<T>::paintSeeds(QPainter *painter)
   {
     Converter<Geom_traits> convert;
     painter->setPen(this->seedsPen());
-    QMatrix matrix = painter->matrix();
-    painter->resetMatrix();
+    QTransform matrix = painter->worldTransform();
+    painter->resetTransform();
 
     typename std::list<Point>::iterator sit;
     for(sit = seeds_begin; sit != seeds_end; ++sit)
       painter->drawPoint(matrix.map(convert(*sit)));
 
-    painter->setMatrix(matrix);
+    painter->setWorldTransform(matrix);
   }
 }
 
diff --git a/GraphicsView/include/CGAL/Qt/PointsGraphicsItem.h b/GraphicsView/include/CGAL/Qt/PointsGraphicsItem.h
index 1b9e16afbf3..fb6d2d75ad1 100644
--- a/GraphicsView/include/CGAL/Qt/PointsGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/PointsGraphicsItem.h
@@ -124,8 +124,8 @@ PointsGraphicsItem<P>::paint(QPainter *painter,
     Converter<Traits> convert;
 
     painter->setPen(verticesPen());
-    QMatrix matrix = painter->matrix();
-    painter->resetMatrix();
+    QTransform matrix = painter->worldTransform();
+    painter->resetTransform();
     for(typename P::iterator it = points->begin();
         it != points->end();
         it++){
diff --git a/GraphicsView/include/CGAL/Qt/PointsInKdTreeGraphicsItem.h b/GraphicsView/include/CGAL/Qt/PointsInKdTreeGraphicsItem.h
index 174df6b81ca..b3afe81e613 100644
--- a/GraphicsView/include/CGAL/Qt/PointsInKdTreeGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/PointsInKdTreeGraphicsItem.h
@@ -160,8 +160,8 @@ PointsInKdTreeGraphicsItem<KdTree>::paint(QPainter *painter,
   Iso_rectangle_2 isor = convert(option->exposedRect);
   Fuzzy_iso_box range(isor.vertex(0), isor.vertex(2));
   painter->setPen(verticesPen());
-  QMatrix matrix = painter->matrix();
-  painter->resetMatrix();
+  QTransform matrix = painter->worldTransform();
+  painter->resetTransform();
   Draw<Traits> draw(painter, &matrix);
   kdtree->search(draw, range);
 }
diff --git a/GraphicsView/include/CGAL/Qt/PolygonGraphicsItem.h b/GraphicsView/include/CGAL/Qt/PolygonGraphicsItem.h
index e3cb1fea05e..e196243da05 100644
--- a/GraphicsView/include/CGAL/Qt/PolygonGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/PolygonGraphicsItem.h
@@ -154,8 +154,8 @@ PolygonGraphicsItem<P>::paint(QPainter *painter,
     Converter<Traits> convert;
 
     painter->setPen(verticesPen());
-    QMatrix matrix = painter->matrix();
-    painter->resetMatrix();
+    QTransform matrix = painter->worldTransform();
+    painter->resetTransform();
     for(typename P::Vertex_iterator it = poly->vertices_begin();
         it != poly->vertices_end();
         it++){
diff --git a/GraphicsView/include/CGAL/Qt/PolygonWithHolesGraphicsItem.h b/GraphicsView/include/CGAL/Qt/PolygonWithHolesGraphicsItem.h
index 7cfc8883694..cfdcb4fa915 100644
--- a/GraphicsView/include/CGAL/Qt/PolygonWithHolesGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/PolygonWithHolesGraphicsItem.h
@@ -181,8 +181,8 @@ PolygonWithHolesGraphicsItem<P>::paint(QPainter *painter,
   if(drawVertices()) {
 
     painter->setPen(verticesPen());
-    QMatrix matrix = painter->matrix();
-    painter->resetMatrix();
+    QTransform matrix = painter->worldTransform();
+    painter->resetTransform();
     for(typename P::General_polygon_2::Vertex_iterator it = poly->outer_boundary().vertices_begin();
         it != poly->outer_boundary().vertices_end();
         it++){
diff --git a/GraphicsView/include/CGAL/Qt/RegularGridGraphicsItem.h b/GraphicsView/include/CGAL/Qt/RegularGridGraphicsItem.h
index f5f519afa31..ddcbb303032 100644
--- a/GraphicsView/include/CGAL/Qt/RegularGridGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/RegularGridGraphicsItem.h
@@ -180,8 +180,8 @@ void
 
   /*
   painter->setPen(this->verticesPen());
-  QMatrix matrix = painter->matrix();
-  painter->resetMatrix();
+  QTransform matrix = painter->worldTransform();
+  painter->resetTransform();
   for(int i = 0; i < nw; i++){
     for(int j = 0; j < nh; j++){
       painter->drawPoint(matrix.map(QPointF(i*dw, j*dh)));
diff --git a/GraphicsView/include/CGAL/Qt/RegularGridVectorFieldGraphicsItem.h b/GraphicsView/include/CGAL/Qt/RegularGridVectorFieldGraphicsItem.h
index bcddcc2ccf7..fd9367cd04a 100644
--- a/GraphicsView/include/CGAL/Qt/RegularGridVectorFieldGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/RegularGridVectorFieldGraphicsItem.h
@@ -163,8 +163,8 @@ void
     }
   }
   painter->setPen(this->verticesPen());
-  QMatrix matrix = painter->matrix();
-  painter->resetMatrix();
+  QTransform matrix = painter->worldTransform();
+  painter->resetTransform();
   for(int i = 0; i < nw; i++){
     for(int j = 0; j < nh; j++){
       painter->drawPoint(matrix.map(QPointF(i*dw, j*dh)));
diff --git a/GraphicsView/include/CGAL/Qt/RegularTriangulationGraphicsItem.h b/GraphicsView/include/CGAL/Qt/RegularTriangulationGraphicsItem.h
index bcd70597fb3..f838e505775 100644
--- a/GraphicsView/include/CGAL/Qt/RegularTriangulationGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/RegularTriangulationGraphicsItem.h
@@ -209,8 +209,8 @@ RegularTriangulationGraphicsItem<T>::paintVertices(QPainter *painter)
     }
 
 
-    QMatrix matrix = painter->matrix();
-    painter->resetMatrix();
+    QTransform matrix = painter->worldTransform();
+    painter->resetTransform();
     for(typename T::Finite_vertices_iterator it = t->finite_vertices_begin();
         it != t->finite_vertices_end();
         it++){
@@ -228,10 +228,10 @@ RegularTriangulationGraphicsItem<T>::paintOneVertex(const typename T::Point& poi
   typename T::Bare_point p = t->geom_traits().construct_point_2_object()(point);
 
   m_painter->setPen(this->verticesPen());
-  QMatrix matrix = m_painter->matrix();
-  m_painter->resetMatrix();
+  QTransform matrix = m_painter->worldTransform();
+  m_painter->resetTransform();
   m_painter->drawPoint(matrix.map(convert(p)));
-  m_painter->setMatrix(matrix);
+  m_painter->setWorldTransform(matrix);
 }
 
 template <typename T>
diff --git a/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h b/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h
index d9fb9e6b5e0..33799f93e6d 100644
--- a/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h
@@ -165,8 +165,8 @@ SegmentDelaunayGraphGraphicsItem<T>::drawAll(QPainter *painter, const QStyleOpti
     }
     {
     m_painter->setPen(this->verticesPen());
-    QMatrix matrix = m_painter->matrix();
-    m_painter->resetMatrix();
+    QTransform matrix = m_painter->worldTransform();
+    m_painter->resetTransform();
     Converter<Kern> convert;
       typename T::Finite_vertices_iterator vit;
       for (vit = t->finite_vertices_begin();
diff --git a/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphLinfGraphicsItem.h b/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphLinfGraphicsItem.h
index 43ba00ccbf6..170e1cae0bd 100644
--- a/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphLinfGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphLinfGraphicsItem.h
@@ -200,8 +200,8 @@ SegmentDelaunayGraphLinfGraphicsItem<T>::drawAll(QPainter *painter, const QStyle
     }
     {
     m_painter->setPen(this->verticesPen());
-    QMatrix matrix = m_painter->matrix();
-    m_painter->resetMatrix();
+    QTransform matrix = m_painter->worldTransform();
+    m_painter->resetTransform();
     Converter<Kern> convert;
       typename T::Finite_vertices_iterator vit;
       for (vit = t->finite_vertices_begin();
diff --git a/GraphicsView/include/CGAL/Qt/TriangulationGraphicsItem.h b/GraphicsView/include/CGAL/Qt/TriangulationGraphicsItem.h
index 6fa0ed0c240..30d74c01471 100644
--- a/GraphicsView/include/CGAL/Qt/TriangulationGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/TriangulationGraphicsItem.h
@@ -197,8 +197,8 @@ TriangulationGraphicsItem<T>::paintVertices(QPainter *painter)
     Converter<Geom_traits> convert;
 
     painter->setPen(verticesPen());
-    QMatrix matrix = painter->matrix();
-    painter->resetMatrix();
+    QTransform matrix = painter->worldTransform();
+    painter->resetTransform();
     for(typename T::Finite_vertices_iterator it = t->finite_vertices_begin();
         it != t->finite_vertices_end();
         it++){
@@ -215,10 +215,10 @@ TriangulationGraphicsItem<T>::paintOneVertex(const typename T::Point& point)
   Converter<Geom_traits> convert;
 
   m_painter->setPen(this->verticesPen());
-  QMatrix matrix = m_painter->matrix();
-  m_painter->resetMatrix();
+  QTransform matrix = m_painter->worldTransform();
+  m_painter->resetTransform();
   m_painter->drawPoint(matrix.map(convert(point)));
-  m_painter->setMatrix(matrix);
+  m_painter->setWorldTransform(matrix);
 }
 
 template <typename T>
@@ -228,10 +228,10 @@ TriangulationGraphicsItem<T>::paintVertex(typename T::Vertex_handle vh)
   Converter<Geom_traits> convert;
 
   m_painter->setPen(this->verticesPen());
-  QMatrix matrix = m_painter->matrix();
-  m_painter->resetMatrix();
+  QTransform matrix = m_painter->worldTransform();
+  m_painter->resetTransform();
   m_painter->drawPoint(matrix.map(convert(vh->point())));
-  m_painter->setMatrix(matrix);
+  m_painter->setWorldTransform(matrix);
 }
 
 template <typename T>
diff --git a/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/Polyline_simplification_2_graphics_item.h b/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/Polyline_simplification_2_graphics_item.h
index 326b27b22f9..f40dcd9cfae 100644
--- a/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/Polyline_simplification_2_graphics_item.h
+++ b/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/Polyline_simplification_2_graphics_item.h
@@ -175,10 +175,10 @@ PolylineSimplificationGraphicsItem<PCT>::paintVertex( typename PCT::Vertex_handl
   // } else {
     this->m_painter->setPen(this->verticesPen());
     //  }
-  QMatrix matrix = this->m_painter->matrix();
-  this->m_painter->resetMatrix();
+  QTransform matrix = this->m_painter->worldTransform();
+  this->m_painter->resetTransform();
   this->m_painter->drawPoint(matrix.map(convert(vh->point())));
-  this->m_painter->setMatrix(matrix);
+  this->m_painter->setWorldTransform(matrix);
 }
 
 
@@ -190,8 +190,8 @@ PolylineSimplificationGraphicsItem<PCT>::paintVertices(QPainter *painter)
   {
     Converter<Geom_traits> convert;
 
-    QMatrix matrix = painter->matrix();
-    painter->resetMatrix();
+    QTransform matrix = painter->worldTransform();
+    painter->resetTransform();
     for(Constraint_iterator cit = this->t->constraints_begin();
         cit != this->t->constraints_end();
         ++cit){
diff --git a/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/TriangulationArrangementGraphicsItem.h b/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/TriangulationArrangementGraphicsItem.h
index 6f7359eef00..0de22e1ee60 100644
--- a/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/TriangulationArrangementGraphicsItem.h
+++ b/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/TriangulationArrangementGraphicsItem.h
@@ -154,10 +154,10 @@ TriangulationArrangementGraphicsItem<T>::paintVertex(typename T::Vertex_handle v
     } else {
       this->m_painter->setPen(this->verticesPen());
     }
-    QMatrix matrix = this->m_painter->matrix();
-    this->m_painter->resetMatrix();
+    QTransform matrix = this->m_painter->worldTransform();
+    this->m_painter->resetTransform();
     this->m_painter->drawPoint(matrix.map(convert(vh->point())));
-    this->m_painter->setMatrix(matrix);
+    this->m_painter->setWorldTransform(matrix);
   }
 }
 
@@ -170,8 +170,8 @@ TriangulationArrangementGraphicsItem<T>::paintVertices(QPainter *painter)
   {
     Converter<Geom_traits> convert;
 
-    QMatrix matrix = painter->matrix();
-    painter->resetMatrix();
+    QTransform matrix = painter->worldTransform();
+    painter->resetTransform();
     for(typename T::Finite_vertices_iterator it = this->t->finite_vertices_begin();
         it != this->t->finite_vertices_end();
         it++)