Merge remote-tracking branch 'origin/stable' into dev

For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812

1 files changed, 7 insertions, 2 deletions

diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h
index d3189f8641..580fc15233 100644
--- a/src/gui/kernel/qplatformintegration.h
+++ b/src/gui/kernel/qplatformintegration.h
@@ -94,7 +94,8 @@ public:
         ForeignWindows,
         NonFullScreenWindows,
         NativeWidgets,
-        WindowManagement
+        WindowManagement,
+        SyncState
     };
 
     virtual ~QPlatformIntegration() { }
@@ -146,10 +147,12 @@ public:
         UseRtlExtensions,
         SynthesizeMouseFromTouchEvents,
         PasswordMaskCharacter,
-        SetFocusOnTouchRelease
+        SetFocusOnTouchRelease,
+        ShowIsMaximized
     };
 
     virtual QVariant styleHint(StyleHint hint) const;
+    virtual Qt::WindowState defaultWindowState(Qt::WindowFlags) const;
 
     virtual Qt::KeyboardModifiers queryKeyboardModifiers() const;
     virtual QList<int> possibleKeys(const QKeyEvent *) const;
@@ -162,6 +165,8 @@ public:
 #ifndef QT_NO_SESSIONMANAGER
     virtual QPlatformSessionManager *createPlatformSessionManager(const QString &id, const QString &key) const;
 #endif
+
+    virtual void sync();
 protected:
     void screenAdded(QPlatformScreen *screen);
 };