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

5 files changed, 4 insertions, 10 deletions

diff --git a/src/GudhUI/gui/MainWindow.h b/src/GudhUI/gui/MainWindow.h
index c8c3fcf6..7e11ddd6 100644
--- a/src/GudhUI/gui/MainWindow.h
+++ b/src/GudhUI/gui/MainWindow.h
@@ -23,9 +23,6 @@
 #ifndef GUI_MAINWINDOW_H_
 #define GUI_MAINWINDOW_H_
 
-// Workaround for moc-qt4 not parsing boost headers
-#include <CGAL/config.h>
-
 #include <QMainWindow>
 #include "ui_main_window.h"
 #include "model/Model.h"
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"
 
diff --git a/src/GudhUI/gui/Menu_k_nearest_neighbors.h b/src/GudhUI/gui/Menu_k_nearest_neighbors.h
index 8088b768..77303b67 100644
--- a/src/GudhUI/gui/Menu_k_nearest_neighbors.h
+++ b/src/GudhUI/gui/Menu_k_nearest_neighbors.h
@@ -24,7 +24,7 @@
 #define GUI_MENU_K_NEAREST_NEIGHBORS_H_
 
 #include <QMainWindow>
-#include "gui/ui_KNearestNeighborsMenu.h"
+#include "ui_KNearestNeighborsMenu.h"
 
 class QWidget;
 
diff --git a/src/GudhUI/gui/Menu_persistence.h b/src/GudhUI/gui/Menu_persistence.h
index 8c4df158..1a2a2408 100644
--- a/src/GudhUI/gui/Menu_persistence.h
+++ b/src/GudhUI/gui/Menu_persistence.h
@@ -25,7 +25,7 @@
 #define GUI_MENU_PERSISTENCE_H_
 
 #include <QMainWindow>
-#include "gui/ui_PersistenceMenu.h"
+#include "ui_PersistenceMenu.h"
 
 class QWidget;
 
diff --git a/src/GudhUI/gui/Menu_uniform_neighbors.h b/src/GudhUI/gui/Menu_uniform_neighbors.h
index 0b6f65fe..61316966 100644
--- a/src/GudhUI/gui/Menu_uniform_neighbors.h
+++ b/src/GudhUI/gui/Menu_uniform_neighbors.h
@@ -25,7 +25,7 @@
 #define GUI_MENU_UNIFORM_NEIGHBORS_H_
 
 #include <QMainWindow>
-#include "gui/ui_UniformNeighborsMenu.h"
+#include "ui_UniformNeighborsMenu.h"
 
 class Menu_uniform_neighbors : public QDialog, public Ui::UniformMenu {
   Q_OBJECT