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

1 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/platforms/qnx/qqnxwindow.h b/src/plugins/platforms/qnx/qqnxwindow.h
index 9c03af7594..cbe4eba7a4 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.h
+++ b/src/plugins/platforms/qnx/qqnxwindow.h
@@ -69,11 +69,11 @@ public:
     QQnxWindow(QWindow *window, screen_context_t context);
     virtual ~QQnxWindow();
 
-    virtual void setGeometry(const QRect &rect);
-    virtual void setVisible(bool visible);
-    virtual void setOpacity(qreal level);
+    void setGeometry(const QRect &rect);
+    void setVisible(bool visible);
+    void setOpacity(qreal level);
 
-    virtual WId winId() const { return (WId)m_window; }
+    WId winId() const { return (WId)m_window; }
     screen_window_t nativeHandle() const { return m_window; }
 
     void setBufferSize(const QSize &size);
@@ -86,10 +86,10 @@ public:
 
     void setScreen(QQnxScreen *platformScreen);
 
-    virtual void setParent(const QPlatformWindow *window);
-    virtual void raise();
-    virtual void lower();
-    virtual void requestActivateWindow();
+    void setParent(const QPlatformWindow *window);
+    void raise();
+    void lower();
+    void requestActivateWindow();
 
     void gainedFocus();