diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-09-28 22:20:06 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 05:59:07 +0200 |
commit | 3fd9398052d2b483d2830c3661ceed26e551fa49 (patch) | |
tree | 9eeca582e2c749aca76c3df38ffb1043344a70c6 /src/opengl/qgl.cpp | |
parent | 302b3c7d073d1bccd4468c990510697b77b2ece9 (diff) |
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>
Diffstat (limited to 'src/opengl/qgl.cpp')
-rw-r--r-- | src/opengl/qgl.cpp | 55 |
1 files changed, 0 insertions, 55 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 |