diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2012-11-22 08:35:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-22 22:58:10 +0100 |
| commit | cc736c6858fd1f8a10745fc5b9bb03ef3d7631e2 (patch) | |
| tree | 075254f84bad4d26abaa8f4adf9137eaa72a1eef /src/opengl/qgl.h | |
| parent | c8c1604e881920cd6130dd642d0cace77dd4cbe5 (diff) | |
Get rid of deprecated functionality in QtOpenGL.
We will in any case not be able to support this in Qt 5, so best to just
remove it to not give any false impressions.
Change-Id: Ib52e86007b9e6483bd973f13502b078792a9fa40
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 53a775b43a..ab2fd8d203 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -343,7 +343,6 @@ protected: void setWindowCreated(bool on); bool initialized() const; void setInitialized(bool on); - void generateFontDisplayLists(const QFont & fnt, int listBase); uint colorIndex(const QColor& c) const; void setValid(bool valid); @@ -430,9 +429,9 @@ public: void setColormap(const QGLColormap & map); void renderText(int x, int y, const QString & str, - const QFont & fnt = QFont(), int listBase = 2000); + const QFont & fnt = QFont()); void renderText(double x, double y, double z, const QString & str, - const QFont & fnt = QFont(), int listBase = 2000); + const QFont & fnt = QFont()); QPaintEngine *paintEngine() const; GLuint bindTexture(const QImage &image, GLenum target, GLint format, @@ -474,7 +473,6 @@ protected: virtual void glInit(); virtual void glDraw(); - int fontDisplayListBase(const QFont & fnt, int listBase = 2000); QGLWidget(QGLWidgetPrivate &dd, const QGLFormat &format = QGLFormat(), |