From 3768a3b7e7a06a014fe34cbdf809fbbda5921492 Mon Sep 17 00:00:00 2001 From: granzuglia Date: Sun, 24 Mar 2013 19:50:48 +0000 Subject: [PATCH] - renamed qDebug function in GLCheckError causing conflict in qt 5.0 --- wrap/qt/checkGLError.h | 2 +- wrap/qt/gl_label.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wrap/qt/checkGLError.h b/wrap/qt/checkGLError.h index f0123aa3..85ecbbfb 100755 --- a/wrap/qt/checkGLError.h +++ b/wrap/qt/checkGLError.h @@ -43,7 +43,7 @@ class checkGLError return message; } - static void qDebug(const char* m) { + static void debugInfo(const char* m) { QString message=makeString(m); if(message.isEmpty()) return; ::qDebug("%s",qPrintable(message)); diff --git a/wrap/qt/gl_label.h b/wrap/qt/gl_label.h index 80c484f3..86c06764 100755 --- a/wrap/qt/gl_label.h +++ b/wrap/qt/gl_label.h @@ -76,7 +76,7 @@ namespace vcg static void exit2D(QPainter *painter) { - checkGLError::qDebug("glLabel"); + //checkGLError::qDebug("glLabel"); painter->restore(); painter->beginNativePainting(); glMatrixMode(GL_PROJECTION); @@ -84,7 +84,7 @@ namespace vcg glMatrixMode(GL_MODELVIEW); glPopMatrix(); glPopAttrib(); - checkGLError::qDebug("glLabel"); + //checkGLError::qDebug("glLabel"); } public: