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 <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

2 files changed, 0 insertions, 70 deletions

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index ad53b20098..38b8e44c0b 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -4684,61 +4684,6 @@ QPaintEngine *QGLWidget::paintEngine() const
     return qt_qgl_paint_engine();
 }
 
-#ifdef QT3_SUPPORT
-/*!
-    \overload
-    \obsolete
- */
-QGLWidget::QGLWidget(QWidget *parent, const char *name,
-                      const QGLWidget* shareWidget, Qt::WindowFlags f)
-    : QWidget(*(new QGLWidgetPrivate), parent, f | Qt::MSWindowsOwnDC)
-{
-    Q_D(QGLWidget);
-    if (name)
-        setObjectName(QString::fromAscii(name));
-    setAttribute(Qt::WA_PaintOnScreen);
-    setAttribute(Qt::WA_NoSystemBackground);
-    setAutoFillBackground(true); // for compatibility
-    d->init(new QGLContext(QGLFormat::defaultFormat(), this), shareWidget);
-}
-
-/*!
-    \overload
-    \obsolete
- */
-QGLWidget::QGLWidget(const QGLFormat &format, QWidget *parent,
-                      const char *name, const QGLWidget* shareWidget,
-                      Qt::WindowFlags f)
-    : QWidget(*(new QGLWidgetPrivate), parent, f | Qt::MSWindowsOwnDC)
-{
-    Q_D(QGLWidget);
-    if (name)
-        setObjectName(QString::fromAscii(name));
-    setAttribute(Qt::WA_PaintOnScreen);
-    setAttribute(Qt::WA_NoSystemBackground);
-    setAutoFillBackground(true); // for compatibility
-    d->init(new QGLContext(format, this), shareWidget);
-}
-
-/*!
-    \overload
-    \obsolete
- */
-QGLWidget::QGLWidget(QGLContext *context, QWidget *parent,
-                      const char *name, const QGLWidget *shareWidget, Qt::WindowFlags f)
-    : QWidget(*(new QGLWidgetPrivate), parent, f | Qt::MSWindowsOwnDC)
-{
-    Q_D(QGLWidget);
-    if (name)
-        setObjectName(QString::fromAscii(name));
-    setAttribute(Qt::WA_PaintOnScreen);
-    setAttribute(Qt::WA_NoSystemBackground);
-    setAutoFillBackground(true); // for compatibility
-    d->init(context, shareWidget);
-}
-
-#endif // QT3_SUPPORT
-
 typedef GLubyte * (*qt_glGetStringi)(GLenum, GLuint);
 
 #ifndef GL_NUM_EXTENSIONS
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;