Merge branch 'master' of cgogn:CGoGN into no_boundary

1b28477f · Sylvain Thery · 45129066 · e9501a68 · 1b28477f · 1b28477f
Commit 1b28477f authored Nov 16, 2011 by Sylvain Thery
--- a/Apps/Examples/Debug/CMakeLists.txt
+++ b/Apps/Examples/Debug/CMakeLists.txt
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)

 project(examplesD)


--- a/Apps/Examples/Release/CMakeLists.txt
+++ b/Apps/Examples/Release/CMakeLists.txt
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)

 project(examples)


--- a/Apps/Examples/clipping.cpp
+++ b/Apps/Examples/clipping.cpp
@@ -186,10 +186,7 @@ void Clipping::slot_spinBox_GridResolution(int i)

 void Clipping::slot_pushButton_changePlanesColor()
 {
-	QColor NewColor;
-	QColorDialog ColDialog;
-
-	NewColor = ColDialog.getColor();
+	QColor NewColor = QColorDialog::getColor();

 	int r, g, b;
 	NewColor.getRgb(&r, &g, &b);

--- a/Apps/Tuto/CMakeLists.txt
+++ b/Apps/Tuto/CMakeLists.txt
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)

 project(Tutos)


--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)

 project(CGoGN)


--- a/build/Debug/CMakeLists.txt
+++ b/build/Debug/CMakeLists.txt
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)

 project(CGoGNDebug)


--- a/build/Release/CMakeLists.txt
+++ b/build/Release/CMakeLists.txt
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)

 project(CGoGNRelease)