whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed Qt 5 todo comments from qgl.h / qgl_p.h. 

No point in changing QGLContext API when QOpenGLContext is meant to
obsolete it.

Task-number: QTBUG-25074
Change-Id: Ie21692c8c402ed9cd6af56bef0175c4e46c3d8a9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
bb10
Samuel Rødal 2012-04-02 08:48:47 +02:00 committed by Qt by Nokia
parent 89387415b1
commit 592bb3ca5e
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opengl/qgl.h
View File

@ -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(),

1
src/opengl/qgl_p.h
View File

@ -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