From a2f65f19cae613b95b7b572d30a6b3526a0dc952 Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Sun, 7 Oct 2012 17:33:19 +0000
Subject: [PATCH] Corrected errors for gcc-4.6 under ubuntu (conflicts between
 glew and qt :( )

---
 apps/sample/trimesh_ant_qt/glwidget.cpp       | 4 ----
 apps/sample/trimesh_ant_qt/glwidget.h         | 4 ++++
 apps/sample/trimesh_ant_qt/trimesh_ant_qt.pro | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/sample/trimesh_ant_qt/glwidget.cpp b/apps/sample/trimesh_ant_qt/glwidget.cpp
index 7298ac27..2bcd4d2d 100644
--- a/apps/sample/trimesh_ant_qt/glwidget.cpp
+++ b/apps/sample/trimesh_ant_qt/glwidget.cpp
@@ -38,10 +38,6 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
-#include <QtOpenGL>
-#include <math.h>
-
 #include "glwidget.h"
 #include <wrap/qt/trackball.h>
 #include <wrap/gl/picking.h>
diff --git a/apps/sample/trimesh_ant_qt/glwidget.h b/apps/sample/trimesh_ant_qt/glwidget.h
index 2925c867..58a5aba7 100644
--- a/apps/sample/trimesh_ant_qt/glwidget.h
+++ b/apps/sample/trimesh_ant_qt/glwidget.h
@@ -41,7 +41,10 @@
 #ifndef GLWIDGET_H
 #define GLWIDGET_H
 
+#include <GL/glew.h>
 #include <QGLWidget>
+#include <QKeyEvent>
+
 /// vcg imports
 #include <vcg/simplex/vertex/base.h>
 #include <vcg/simplex/face/base.h>
@@ -55,6 +58,7 @@
 #include <wrap/gl/trimesh.h>
 #include <wrap/gui/trackball.h>
 
+
 /// declaring edge and face type
 #include <AntTweakBar.h>
 using namespace vcg;
diff --git a/apps/sample/trimesh_ant_qt/trimesh_ant_qt.pro b/apps/sample/trimesh_ant_qt/trimesh_ant_qt.pro
index 22f036b2..139ba865 100644
--- a/apps/sample/trimesh_ant_qt/trimesh_ant_qt.pro
+++ b/apps/sample/trimesh_ant_qt/trimesh_ant_qt.pro
@@ -35,3 +35,6 @@ mac{
   QMAKE_POST_LINK ="cp -P ../../../../code/lib/AntTweakBar1.14/lib/libAntTweakBar.dylib . ; install_name_tool -change ../lib/libAntTweakBar.dylib ./libAntTweakBar.dylib $$TARGET"
 }
 
+unix{
+  LIBS +=$$ANTDIR/lib/libAntTweakBar.so -lGLU
+}