diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-20 16:05:07 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-20 16:05:07 +0000 |
| commit | cd9d7681e06f29a25cf5775a384ac2e07e34abe9 (patch) | |
| tree | 4e6b8ccbf21c28c103effd9342f75907c89cf42a /src/GudhUI/gui/Menu_edge_contraction.h | |
| parent | cbf1a50068a2c5dea6d732d40dfc66d34460d863 (diff) | |
| parent | 3f451b963739a595d990be5517d386259ddb487f (diff) | |
Merge qt5 branch for GudhUI tompile wit qt5 instead of qt4
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1977 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: dc3a76decfb432227892bd231c1080577c6ac06e
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" |