summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-06-24 11:14:21 (GMT)
committeraxis <qt-info@nokia.com>2010-06-24 11:14:21 (GMT)
commit447f2b410335730cd172a76abce184bacae186d2 (patch)
tree73d93ef871e99f03eedd69eeb0fa74228c1e33d3 /src/opengl
parent5ce3b09f9b3c574fc4ab2ecc42f879e64df0e6a1 (diff)
parent7ae5285132db6c435e91ab097f41097217d68a2c (diff)
downloadQt-447f2b410335730cd172a76abce184bacae186d2.zip
Qt-447f2b410335730cd172a76abce184bacae186d2.tar.gz
Qt-447f2b410335730cd172a76abce184bacae186d2.tar.bz2
Merge branch '4.6-s60' into 4.7-s60
Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/plugins/phonon/mmf/mmf.pro
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 1727a41..cd5dbbe 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -86,7 +86,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
QT_END_INCLUDE_NAMESPACE
# ifdef old_qDebug
# undef qDebug
-# define qDebug QT_QDEBUG_MACRO
+# define qDebug QT_NO_QDEBUG_MACRO
# undef old_qDebug
# endif
class QMacWindowChangeEvent;