manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- renamed qDebug function in GLCheckError causing conflict in qt 5.0

This commit is contained in:
granzuglia 2013-03-24 19:50:48 +00:00
parent 5bcce6a3d5
commit 3768a3b7e7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wrap/qt/checkGLError.h
View File

@ -43,7 +43,7 @@ class checkGLError
return message; return message;
} }
static void qDebug(const char* m) { static void debugInfo(const char* m) {
QString message=makeString(m); QString message=makeString(m);
if(message.isEmpty()) return; if(message.isEmpty()) return;
::qDebug("%s",qPrintable(message)); ::qDebug("%s",qPrintable(message));

4
wrap/qt/gl_label.h
View File

@ -76,7 +76,7 @@ namespace vcg
static void exit2D(QPainter *painter) static void exit2D(QPainter *painter)
{ {
checkGLError::qDebug("glLabel"); //checkGLError::qDebug("glLabel");
painter->restore(); painter->restore();
painter->beginNativePainting(); painter->beginNativePainting();
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
@ -84,7 +84,7 @@ namespace vcg
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glPopMatrix(); glPopMatrix();
glPopAttrib(); glPopAttrib();
checkGLError::qDebug("glLabel"); //checkGLError::qDebug("glLabel");
} }
public: public: