Commit Graph

848 Commits

Author SHA1 Message Date
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Sébastien Loriot 970105e31c fix qt dependency text 2015-09-10 15:04:12 +02:00
Laurent Rineau 278a28016a Merge branch 'CGAL-Qt5_support-GF'
Fixes #265, fixes #254.
2015-08-27 16:37:37 +02:00
Laurent Rineau 91bca286d3 Fix warnings with CGAL_USE
All those variables were unused only if CGAL_NDEBUG was
defined. CGAL_USE can solve that.
2015-08-19 17:37:46 +02:00
Maxime Gimeno 7d220d3da8 Context 3.3 Core changed into 2.1 2015-08-10 08:59:54 +02:00
Laurent Rineau d8e475d2c0 Merge pull request #241 from bo0ts/GraphicsView-better_dependency_check-pmoeller
Provide a better dependency check in GraphicsView
2015-08-05 11:27:57 +02:00
Laurent Rineau 9fc31e6093 Merge pull request #238 from lrineau/GraphicsView-fix_segment_delaunay_graph_demos-GF
Graphics View demos: remove unwanted slots
2015-08-04 18:03:04 +02:00
Philipp Möller 986a7ae77b Return early when missing dependencies
This saves parsing time, indentation depth, keeps messages local and
reduces code complexity.
2015-08-04 16:02:54 +02:00
Philipp Möller 57f97635c2 Report the exact missing dependencies
Build a variable with missing dependencies and use that to produce and
error message. Pretty printing could still be improved.
2015-08-04 16:01:35 +02:00
Laurent Rineau 21e6e8bcc1 Merge pull request #227 from lrineau/Testsuite-display_Qt5_version_in_results-GF
Display Qt5 version in testsuite result pages (partially tested).
2015-08-04 13:04:22 +02:00
Laurent Rineau 2a9c1c3843 Demote a slot, to a private function
Should fix #234
2015-08-03 17:43:02 +02:00
Laurent Rineau 39ab917ad8 Remove on_actionSaveConstraints_triggered
The action was:
  - not implemented
  - not connected to any slot.
2015-08-03 17:42:53 +02:00
Laurent Rineau 568179e8d6 Cleanup of c5940aab10 2015-08-03 16:41:43 +02:00
Laurent Rineau 93fb88b499 Display Qt5 version in testsuite result pages 2015-08-03 13:09:44 +02:00
Andreas Fabri f864b0a8e8 fix line width in demos using GraphicsView 2015-07-28 15:46:11 +02:00
Maxime Gimeno a571e1db8d Clean-up 2015-07-16 08:26:41 +02:00
Laurent Rineau bc0c30bbfd Better display of the Qt5 configuration 2015-07-15 15:53:52 +02:00
Maxime Gimeno c5940aab10 Use reserve to try to optimize the memory use 2015-07-15 13:53:13 +02:00
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Laurent Rineau ae6412fb96 Merge modifications made by Andreas to 'sdglinf-philaris' for Qt5
Merge remote-tracking branch 'cgal-dev/sdglinf-philaris' into CGAL-Qt5_support-GF
2015-07-10 17:28:44 +02:00
Laurent Rineau fa13f4ed0c Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF 2015-07-10 17:28:07 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 9550a41b67 Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller
Add a CGALExports.cmake file

Conflicts:
	GraphicsView/src/CGAL_Qt5/CMakeLists.txt
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in

There was also a conceptual conflict in:
	Installation/src/CMakeLists.txt
2015-07-10 14:03:20 +02:00
Andreas Fabri 2dfa5608c4 fix policy; remove button; fix about 2015-07-10 13:53:56 +02:00
Andreas Fabri 039860653a the demo now compiles with QT5 2015-07-10 13:20:09 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
Laurent Rineau 59f7b09fae Fix remaining CMake warnings about CMP0043 2015-07-08 17:08:35 +02:00
Andreas Fabri 27024787be QGraphicsItem is no longer an interface 2015-07-08 13:07:35 +02:00
Maxime Gimeno 278e9d9829 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
Conflicts:
	Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
2015-07-08 12:40:14 +02:00
Maxime Gimeno c29b3cb700 Inline function used to define an OpenGL context for openGL 3.3. 2015-07-08 12:18:15 +02:00
Sébastien Loriot 44d4005d8a qt 4 -> qt 5 2015-07-08 09:49:46 +02:00
Sébastien Loriot 1d4358e052 update qt urls 2015-07-08 09:48:45 +02:00
Sébastien Loriot e199f546d4 remove QT4 specific code 2015-07-07 19:36:04 +02:00
Sébastien Loriot 0d431e39ab remove qt4 specific code 2015-07-07 18:00:43 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Andreas Fabri ad4a0169fb Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 11:26:47 +02:00
Sébastien Loriot 84dfabf3b4 remove REQUIRED keyword for CGAL_Qt5 in demos
The handling should be with a status message
2015-07-07 11:23:46 +02:00
Andreas Fabri c0149c727f static_casts 2015-07-07 11:00:37 +02:00
Andreas Fabri 74913d5cd8 static_casts 2015-07-07 10:32:45 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
Andreas Fabri 1a3e0e001b add dependendency on svg 2015-07-06 16:31:56 +02:00
Sandeep Kumar Dey 134ca52fea license header 2015-07-03 13:31:22 +02:00
Philipp Möller 33a1fdbcbc Replace CGAL_LIBRARY with the actual CGAL target
The variable CGAL_LIBRARY is no longer defined within the build as it is
completely unnecessary and using the actual target allows more features.
2015-07-03 12:30:23 +02:00
Panagiotis Cheilaris 3e89ca702d sdglinf demo avoid Site_2 warning 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 3d8cc0637f sdglinf CMakeLists fixes from sdgl2 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 9d24a3e5c4 sdglinf demo Q_EMIT use etc. 2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris 4eabd4c09c remove sdglinf painter, widget warnings 2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris 498fd2cec1 rename demo program for sdglinf 2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris bdcf40c753 remove sdglinf hv from GUI demo
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:32:08 +02:00
Panagiotis Cheilaris 201de50a9b SDG Linf demo correct types
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:56 +02:00