Merge remote branch 'qt/master' into symbian-socket-engine

Conflicts:
	src/network/access/qnetworkaccessmanager.cpp
	src/network/bearer/qnetworksession.cpp
	src/network/kernel/qnetworkproxy_symbian.cpp
	src/network/socket/qnativesocketengine_unix.cpp
	tests/auto/platformsocketengine/tst_platformsocketengine.cpp

1 files changed, 9 insertions, 0 deletions

diff --git a/src/gui/kernel/qwindowsysteminterface_qpa_p.h b/src/gui/kernel/qwindowsysteminterface_qpa_p.h
index 78e1f33..3491a1a 100644
--- a/src/gui/kernel/qwindowsysteminterface_qpa_p.h
+++ b/src/gui/kernel/qwindowsysteminterface_qpa_p.h
@@ -54,6 +54,7 @@ public:
         GeometryChange,
         Enter,
         Leave,
+        ActivatedWindow,
         Mouse,
         Wheel,
         Key,
@@ -102,6 +103,14 @@ public:
         QWeakPointer<QWidget> leave;
     };
 
+    class ActivatedWindowEvent : public WindowSystemEvent {
+    public:
+        ActivatedWindowEvent(QWidget *activatedWindow)
+            : WindowSystemEvent(ActivatedWindow), activated(activatedWindow)
+        { }
+        QWeakPointer<QWidget> activated;
+    };
+
     class UserEvent : public WindowSystemEvent {
     public:
         UserEvent(QWidget * w, ulong time, EventType t)