Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/widgets/styles/qwindowsxpstyle.cpp
	tests/auto/gui/kernel/qwindow/qwindow.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3

1 files changed, 11 insertions, 9 deletions

diff --git a/src/plugins/platforms/qnx/qqnxwindow.h b/src/plugins/platforms/qnx/qqnxwindow.h
index 9c03af7594..63e71c0bf8 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();
 
@@ -99,9 +99,11 @@ public:
     void setPlatformOpenGLContext(QQnxGLContext *platformOpenGLContext);
     QQnxGLContext *platformOpenGLContext() const { return m_platformOpenGLContext; }
 
+    QQnxWindow *findWindow(screen_window_t windowHandle);
+
 private:
     void removeFromParent();
-    void offset(const QPoint &offset);
+    void setOffset(const QPoint &setOffset);
     void updateVisibility(bool parentVisible);
     void updateZorder(int &topZorder);