diff options
| -rw-r--r-- | src/opengl/qgl.h | 6 | ||||
| -rw-r--r-- | src/opengl/qgl_p.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index caa5b96cdc..6903d3278c 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -277,7 +277,6 @@ public: QGLFormat requestedFormat() const; void setFormat(const QGLFormat& format); - // ### Qt 5: return bools + maybe remove virtuals virtual void makeCurrent(); virtual void doneCurrent(); @@ -340,7 +339,7 @@ protected: void setWindowCreated(bool on); bool initialized() const; void setInitialized(bool on); - void generateFontDisplayLists(const QFont & fnt, int listBase); // ### Qt 5: remove + void generateFontDisplayLists(const QFont & fnt, int listBase); uint colorIndex(const QColor& c) const; void setValid(bool valid); @@ -402,7 +401,6 @@ public: bool isValid() const; bool isSharing() const; - // ### Qt 5: return bools void makeCurrent(); void doneCurrent(); @@ -474,7 +472,7 @@ protected: virtual void glInit(); virtual void glDraw(); - int fontDisplayListBase(const QFont & fnt, int listBase = 2000); // ### Qt 5: remove + int fontDisplayListBase(const QFont & fnt, int listBase = 2000); QGLWidget(QGLWidgetPrivate &dd, const QGLFormat &format = QGLFormat(), diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 86645fd5c1..fb503a31f1 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -402,7 +402,6 @@ private slots: } }; -// ### make QGLContext a QObject in 5.0 and remove the proxy stuff class Q_OPENGL_EXPORT QGLSignalProxy : public QObject { Q_OBJECT |