From 3fd9398052d2b483d2830c3661ceed26e551fa49 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 28 Sep 2011 22:20:06 +0200 Subject: Remove the remaining traces of QT3_SUPPORT The only place that now still knows about it is moc, so it can still parse old headers. Change-Id: Iafec080f99c67560974e9ebc0cbfb27d9a4b2d6f Reviewed-on: http://codereview.qt-project.org/5755 Reviewed-by: Qt Sanity Bot Reviewed-by: Friedemann Kleint --- src/opengl/qgl.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/opengl/qgl.h') diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 665dcac412..863e5902df 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -82,13 +82,6 @@ QT_BEGIN_NAMESPACE QT_MODULE(OpenGL) -#ifdef QT3_SUPPORT -#define QGL_VERSION 460 -#define QGL_VERSION_STR "4.6" -inline QT3_SUPPORT const char *qGLVersion() { - return QGL_VERSION_STR; -} -#endif #if defined(Q_WS_WIN) || defined(Q_WS_MAC) class QGLCmap; @@ -410,14 +403,6 @@ public: const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0); explicit QGLWidget(const QGLFormat& format, QWidget* parent=0, const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0); -#ifdef QT3_SUPPORT - QT3_SUPPORT_CONSTRUCTOR QGLWidget(QWidget* parent, const char* name, - const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0); - QT3_SUPPORT_CONSTRUCTOR QGLWidget(QGLContext *context, QWidget* parent, const char* name, - const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0); - QT3_SUPPORT_CONSTRUCTOR QGLWidget(const QGLFormat& format, QWidget* parent, const char* name, - const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0); -#endif ~QGLWidget(); void qglColor(const QColor& c) const; -- cgit v1.2.3