cosmetic changes to remove mentions of QT4

sloriot · sloriot · commit 722abba27ba8 · 2015-07-07T18:00:43.000+02:00
diff --git a/AABB_tree/demo/AABB_tree/AABB_demo.cpp b/AABB_tree/demo/AABB_tree/AABB_demo.cpp
@@ -40,9 +40,8 @@ int main(int argc, char **argv)
   app.setApplicationName("AABB tree demo");
   app.setAttribute(Qt::AA_UseDesktopOpenGL);
 
-  // Import resources from libCGALQt (Qt4 or Qt5).
-  // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  // Import resources from libCGALQt (Qt5).
+  CGAL_QT_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/Alpha_shapes_2/demo/Alpha_shapes_2/qt3/CMakeLists.txt b/Alpha_shapes_2/demo/Alpha_shapes_2/qt3/CMakeLists.txt
@@ -9,7 +9,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND QT3_FOUND AND CGAL_Qt3_FOUND)
diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp b/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp
@@ -15,10 +15,10 @@ int main(int argc, char** argv)
   application.setApplicationName("Alpha Shape Reconstruction");
   application.setAttribute(Qt::AA_UseDesktopOpenGL);
 
-  // Import resources from libCGALQt (Qt4 or Qt5).
+  // Import resources from libCGALQt (Qt5).
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
 
-  CGAL_QT_INIT_RESOURCES; //New for Qt5 version !
+  CGAL_QT_INIT_RESOURCES;
   Q_INIT_RESOURCE(Alpha_shape_3);
   
   MainWindow mw;
diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt b/Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
@@ -34,8 +34,6 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_
   # qrc files (resources files, that contain icons, at least)
   qt5_add_resources ( RESOURCE_FILES ./Alpha_shape_3.qrc )
 
-  #qt4_automoc( MainWindow.cpp Viewer.cpp)
-
   add_executable  ( Alpha_shape_3 Alpha_shape_3.cpp MainWindow.cpp Viewer.cpp ${uis}  ${RESOURCE_FILES} )
   qt5_use_modules(Alpha_shape_3 Xml Script OpenGL Svg)
   add_to_cached_list( CGAL_EXECUTABLE_TARGETS Alpha_shape_3 )
diff --git a/Apollonius_graph_2/demo/Apollonius_graph_2/Qt3/CMakeLists.txt b/Apollonius_graph_2/demo/Apollonius_graph_2/Qt3/CMakeLists.txt
@@ -9,7 +9,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND QT3_FOUND AND CGAL_Qt3_FOUND )
diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/old_demo/CMakeLists.txt b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/old_demo/CMakeLists.txt
@@ -13,7 +13,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2/CMakeLists.txt b/Boolean_set_operations_2/demo/Boolean_set_operations_2/CMakeLists.txt
@@ -12,7 +12,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp
@@ -1635,10 +1635,7 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Boolean_operations_2 demo");
 
-  // Import resources from libCGALQt4.
-  // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-
-  //New for Qt5 version !
+  // Import resources from libCGALQt5.
   CGAL_QT_INIT_RESOURCES;
   
   MainWindow mainWindow;
diff --git a/Bounding_volumes/demo/Min_circle_2/CMakeLists.txt b/Bounding_volumes/demo/Min_circle_2/CMakeLists.txt
@@ -12,7 +12,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
diff --git a/Bounding_volumes/demo/Min_ellipse_2/CMakeLists.txt b/Bounding_volumes/demo/Min_ellipse_2/CMakeLists.txt
@@ -12,7 +12,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
diff --git a/Bounding_volumes/demo/Min_quadrilateral_2/Min_quadrilateral_2/CMakeLists.txt b/Bounding_volumes/demo/Min_quadrilateral_2/Min_quadrilateral_2/CMakeLists.txt
@@ -12,7 +12,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
diff --git a/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt b/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt
@@ -12,7 +12,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND QT3_FOUND AND CGAL_Qt3_FOUND)
diff --git a/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt b/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt
@@ -12,7 +12,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
diff --git a/Envelope_3/demo/Envelope_3/CMakeLists.txt b/Envelope_3/demo/Envelope_3/CMakeLists.txt
@@ -17,7 +17,7 @@ if ( CGAL_FOUND )
   
   find_package(Qt3-patched QUIET )
   # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-  # that it can be used together with FindQt4: all its variables are prefixed
+  # that it can be used together with Qt5: all its variables are prefixed
   # by "QT3_" instead of "QT_".
   
   if(CGAL_Qt3_FOUND AND QT3_FOUND AND CGAL_Core_FOUND)
diff --git a/Generator/demo/Generator/qt3/CMakeLists.txt b/Generator/demo/Generator/qt3/CMakeLists.txt
@@ -9,7 +9,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
diff --git a/GraphicsView/TODO b/GraphicsView/TODO
@@ -8,4 +8,4 @@ Shift: pour // aux axes.
 
 Affichage du (x,y) par rapport à l'origine de l'objet en cours.
 
-Integrer src/CGALQt4 dans le build process de CGAL, avec CMake.
+Integrer src/CGALQt5 dans le build process de CGAL, avec CMake.
diff --git a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp
@@ -313,9 +313,8 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Alpha_shape_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
-  // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  // Import resources from libCGAL (Qt5).
+  CGAL_QT_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp
@@ -296,9 +296,9 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Apollonius_graph_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
+  // Import resources from libCGAL (Qt5).
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;   //New for Qt5 version !
+  CGAL_QT_INIT_RESOURCES;
   Q_INIT_RESOURCE(Apollonius_graph_2);
 
   MainWindow mainWindow;
diff --git a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp
@@ -553,9 +553,9 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Bounding_volumes demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
+  // Import resources from libCGAL (Qt5).
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  CGAL_QT_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp b/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp
@@ -287,9 +287,8 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Circular_kernel_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
-  // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  // Import resources from libCGAL (Qt5).
+  CGAL_QT_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Generator/Generator_2.cpp b/GraphicsView/demo/Generator/Generator_2.cpp
@@ -351,9 +351,9 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Generator_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
+  // Import resources from libCGAL (Qt5).
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for QT5 version !
+  CGAL_QT_INIT_RESOURCES;
   Q_INIT_RESOURCE(Generator_2);
 
   MainWindow mainWindow;
diff --git a/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp b/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp
@@ -399,9 +399,8 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("L1 Voronoi diagram_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
-  // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  // Import resources from libCGAL (Qt5).
+  CGAL_QT_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Largest_empty_rect_2/Largest_empty_rectangle_2.cpp b/GraphicsView/demo/Largest_empty_rect_2/Largest_empty_rectangle_2.cpp
@@ -290,9 +290,9 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Largest_empty_rectangle_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
+  // Import resources from libCGAL (Qt5).
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  CGAL_QT_INIT_RESOURCES;
   Q_INIT_RESOURCE(Largest_empty_rectangle_2);
 
   MainWindow mainWindow;
diff --git a/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp
@@ -455,9 +455,9 @@ int main(int argc, char **argv)
   app.setOrganizationName("Nico Kruithof");
   app.setApplicationName("Periodic_2_Delaunay_triangulation_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
+  // Import resources from libCGAL (Qt5).
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  CGAL_QT_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Polygon/Polygon_2.cpp b/GraphicsView/demo/Polygon/Polygon_2.cpp
@@ -572,7 +572,7 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Polygon_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
+  // Import resources from libCGAL (Qt5).
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
   CGAL_QT_INIT_RESOURCES;
   Q_INIT_RESOURCE(Polygon_2);
diff --git a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp
@@ -380,9 +380,8 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Segment Voronoi 2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
-  // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  // Import resources from libCGAL (Qt5).
+  CGAL_QT_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp
@@ -306,9 +306,9 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Snap_rounding_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
+  // Import resources from libCGAL (Qt5).
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  CGAL_QT_INIT_RESOURCES;
   Q_INIT_RESOURCE(Snap_rounding_2);
 
   MainWindow mainWindow;
diff --git a/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp b/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp
@@ -303,9 +303,9 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Spatial_searching_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
+  // Import resources from libCGAL (Qt5).
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  CGAL_QT_INIT_RESOURCES;
   Q_INIT_RESOURCE(Spatial_searching_2);
 
   MainWindow mainWindow;
diff --git a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp
@@ -239,9 +239,9 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Stream_lines_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
+  // Import resources from libCGAL (Qt5).
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  CGAL_QT_INIT_RESOURCES;
   Q_INIT_RESOURCE(Stream_lines_2);
 
   MainWindow mainWindow;
diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
@@ -868,9 +868,8 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Constrained_Delaunay_triangulation_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
-  // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES; //New for Qt5 version !
+  // Import resources from libCGAL (Qt5).
+  CGAL_QT_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp
@@ -396,9 +396,8 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Delaunay_triangulation_2 demo");
 
-  // Import resources from libCGAL (Qt4 or QT5).
-  // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  // Import resources from libCGAL (QT5).
+  CGAL_QT_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp
@@ -304,9 +304,8 @@ int main(int argc, char **argv)
   app.setOrganizationName("GeometryFactory");
   app.setApplicationName("Regular_triangulation_2 demo");
 
-  // Import resources from libCGAL (Qt4 or Qt5).
-  // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  CGAL_QT_INIT_RESOURCES;//New for Qt5 version !
+  // Import resources from libCGAL (Qt5).
+  CGAL_QT_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/Inscribed_areas/demo/Largest_empty_rect_2/Qt3/CMakeLists.txt b/Inscribed_areas/demo/Largest_empty_rect_2/Qt3/CMakeLists.txt
@@ -10,7 +10,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
diff --git a/Installation/LICENSE b/Installation/LICENSE
@@ -6,7 +6,7 @@ an open source license. It is also possible to obtain commercial licenses
 from GeometryFactory (www.geometryfactory.com) for all or parts of CGAL.
 
 The source code of the CGAL library can be found in the directories
-"src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the
+"src/CGAL", "src/CGALQt", "src/CGALQt5" and "include/CGAL" (with the
 exception of "include/CGAL/CORE", "include/CGAL/OpenNL").
 It is specified in each file of the CGAL library which
 license applies to it. This is either the GNU General Public License
diff --git a/Installation/cmake/modules/Qt3Macros-patched.cmake b/Installation/cmake/modules/Qt3Macros-patched.cmake
@@ -3,7 +3,7 @@
 #  macro QT3_AUTOMOC(inputfile ... )
 #  macro QT3_GENERATE_MOC(inputfile outputfile )
 #
-# Adapted to Qt3 and CGAL from FindQt4.cmake (included in CMake 2.4)
+# Adapted to Qt3 for compatibility with Qt5 and CGAL
 
 INCLUDE(AddFileDependencies)
 
diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt b/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt
@@ -17,7 +17,7 @@ if ( CGAL_FOUND )
   
   find_package(Qt3-patched )
   # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-  # that it can be used together with FindQt4: all its variables are prefixed
+  # that it can be used together with Qt5: all its variables are prefixed
   # by "QT3_" instead of "QT_".
   
   if(CGAL_Qt3_FOUND AND QT3_FOUND)
diff --git a/Linear_cell_complex/demo/Linear_cell_complex/Linear_cell_complex_3_demo.cpp b/Linear_cell_complex/demo/Linear_cell_complex/Linear_cell_complex_3_demo.cpp
@@ -37,9 +37,8 @@ int main(int argc, char** argv)
   application.setOrganizationName("CNRS and LIRIS' Establishments");
   application.setApplicationName("3D Linear Cell Complex");
 
-  // Import resources from libCGALQt4 or libCGALQt5.
+  // Import resources from libCGALQt5
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  //Newfor Qt5 version !
   CGAL_Qt_init_resources();// that function is in a DLL
   Q_INIT_RESOURCE(Linear_cell_complex_3);
 
diff --git a/Matrix_search/demo/Matrix_search/CMakeLists.txt b/Matrix_search/demo/Matrix_search/CMakeLists.txt
@@ -12,7 +12,7 @@ include( ${CGAL_USE_FILE} )
 
 find_package(Qt3-patched)
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
-# that it can be used together with FindQt4: all its variables are prefixed
+# that it can be used together with Qt5: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
 if ( CGAL_FOUND AND QT3_FOUND AND CGAL_Qt3_FOUND)
diff --git a/Mesh_2/demo/Mesh_2/Qt3/CMakeLists.txt b/Mesh_2/demo/Mesh_2/Qt3/CMakeLists.txt
diff --git a/Mesh_2/demo/Mesh_2/README.txt b/Mesh_2/demo/Mesh_2/README.txt
diff --git a/Mesh_3/demo/Mesh_3/CMakeLists.txt b/Mesh_3/demo/Mesh_3/CMakeLists.txt
diff --git a/Nef_2/demo/Nef_2/CMakeLists.txt b/Nef_2/demo/Nef_2/CMakeLists.txt
diff --git a/Nef_3/demo/Nef_3/CMakeLists.txt b/Nef_3/demo/Nef_3/CMakeLists.txt
diff --git a/Nef_S2/demo/Nef_S2/CMakeLists.txt b/Nef_S2/demo/Nef_S2/CMakeLists.txt
diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp
diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_3.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_3.cpp
diff --git a/Qt_widget/test/Qt_widget/CMakeLists.txt b/Qt_widget/test/Qt_widget/CMakeLists.txt
diff --git a/Segment_Delaunay_graph_2/demo/README.txt b/Segment_Delaunay_graph_2/demo/README.txt
diff --git a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/Qt3/CMakeLists.txt b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/Qt3/CMakeLists.txt
diff --git a/Snap_rounding_2/demo/Snap_rounding_2/Qt3/CMakeLists.txt b/Snap_rounding_2/demo/Snap_rounding_2/Qt3/CMakeLists.txt
diff --git a/Spatial_searching/demo/Spatial_searching/Qt3/CMakeLists.txt b/Spatial_searching/demo/Spatial_searching/Qt3/CMakeLists.txt
diff --git a/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt
diff --git a/Stream_lines_2/demo/Stream_lines_2/Qt3/CMakeLists.txt b/Stream_lines_2/demo/Stream_lines_2/Qt3/CMakeLists.txt
diff --git a/Surface_mesher/demo/Surface_mesher/Surface_mesher.cpp b/Surface_mesher/demo/Surface_mesher/Surface_mesher.cpp
diff --git a/Triangulation_2/demo/Triangulation_2/README_for_developers.txt b/Triangulation_2/demo/Triangulation_2/README_for_developers.txt
diff --git a/Triangulation_2/demo/Triangulation_2/qt3/CMakeLists.txt b/Triangulation_2/demo/Triangulation_2/qt3/CMakeLists.txt
diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt b/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt
