Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbaseqt-v5.0.0-alpha1

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/platforms/qnx/qqnxglcontext.h b/src/plugins/platforms/qnx/qqnxglcontext.h
index 36c439802a..ee8d61ce00 100644
--- a/src/plugins/platforms/qnx/qqnxglcontext.h
+++ b/src/plugins/platforms/qnx/qqnxglcontext.h
@@ -61,10 +61,10 @@ public:
     static void initialize();
     static void shutdown();
 
-    virtual bool makeCurrent(QPlatformSurface *surface);
-    virtual void doneCurrent();
-    virtual void swapBuffers(QPlatformSurface *surface);
-    virtual QFunctionPointer getProcAddress(const QByteArray &procName);
+    bool makeCurrent(QPlatformSurface *surface);
+    void doneCurrent();
+    void swapBuffers(QPlatformSurface *surface);
+    QFunctionPointer getProcAddress(const QByteArray &procName);
 
     virtual QSurfaceFormat format() const { return m_windowFormat; }