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

Conflicts:
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess_unix.cpp
	src/network/kernel/qnetworkinterface_winrt.cpp
	tools/configure/configureapp.cpp

Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea

1 files changed, 4 insertions, 1 deletions

diff --git a/examples/network/http/main.cpp b/examples/network/http/main.cpp
index 5857af265c..b4960008ec 100644
--- a/examples/network/http/main.cpp
+++ b/examples/network/http/main.cpp
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 #include <QApplication>
+#include <QDesktopWidget>
 #include <QDir>
 
 #include "httpwindow.h"
@@ -47,8 +48,10 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-
     HttpWindow httpWin;
+    const QRect availableSize = QApplication::desktop()->availableGeometry(&httpWin);
+    httpWin.resize(availableSize.width() / 5, availableSize.height() / 5);
+    httpWin.move((availableSize.width() - httpWin.width()) / 2, (availableSize.height() - httpWin.height()) / 2);
 
     httpWin.show();
     return app.exec();