diff options
author | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-16 20:31:18 +0000 |
---|---|---|
committer | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-16 20:31:18 +0000 |
commit | bb3b9da181c3fc4f6de53c6503ab92d732b6190e (patch) | |
tree | cee1eb7b0047b3046ce1257ab398e53f4064cef0 /src/GudhUI/gui/Menu_edge_contraction.h | |
parent | 13762827c4f0a2f3a968e6c208d801eea6c556b8 (diff) |
Initial Qt5 support.
- Clicking OK in dialog windows does not close them, only cancel does, was that already the case with Qt4?
- It does not complain that I have a version of CGAL that does not have a Qt5 component, so the tests are probably not sufficient. However, it still compiles, links and runs. What is the CGAL Qt component used for?
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/qt5@861 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 1affa98623366ac6b74f08e115b33f3f1094e94b
Diffstat (limited to 'src/GudhUI/gui/Menu_edge_contraction.h')
-rw-r--r-- | src/GudhUI/gui/Menu_edge_contraction.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/GudhUI/gui/Menu_edge_contraction.h b/src/GudhUI/gui/Menu_edge_contraction.h index 08f0bf67..2d5640e8 100644 --- a/src/GudhUI/gui/Menu_edge_contraction.h +++ b/src/GudhUI/gui/Menu_edge_contraction.h @@ -23,11 +23,8 @@ #ifndef GUI_MENU_EDGE_CONTRACTION_H_ #define GUI_MENU_EDGE_CONTRACTION_H_ -// Workaround for moc-qt4 not parsing boost headers -#include <CGAL/config.h> - #include "gui/MainWindow.h" -#include "gui/ui_MenuEdgeContraction.h" +#include "ui_MenuEdgeContraction.h" #include "model/Model.h" |