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

Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/widgets/util/util.pri
	tests/auto/corelib/thread/qthread/qthread.pro
	tests/auto/corelib/thread/qthread/tst_qthread.cpp

Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b

1 files changed, 17 insertions, 1 deletions

diff --git a/tests/manual/qtabbar/main.cpp b/tests/manual/qtabbar/main.cpp
index b1ef0df100..5a1a558c10 100644
--- a/tests/manual/qtabbar/main.cpp
+++ b/tests/manual/qtabbar/main.cpp
@@ -56,12 +56,28 @@
 #include <QLayout>
 #include <QDesktopWidget>
 #include <QTabWidget>
+#include <QProxyStyle>
+
+class MyProxyStyle : public QProxyStyle
+{
+public:
+    int styleHint(StyleHint hint, const QStyleOption *option = 0,
+                  const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const
+    {
+        if (hint == QStyle::SH_TabBar_Alignment)
+            return Qt::AlignLeft;
+//            return Qt::AlignRight;
+//            return Qt::AlignCenter;
+        return QProxyStyle::styleHint(hint, option, widget, returnData);
+    }
+};
 
 const int TabCount = 5;
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
+    app.setStyle(new MyProxyStyle);
 
     QWidget widget;
     QStackedWidget stackedWidget;
@@ -69,7 +85,7 @@ int main(int argc, char *argv[])
     tabBar.setDocumentMode(true);
     tabBar.setTabsClosable(true);
     tabBar.setMovable(true);
-    tabBar.setExpanding(true);
+    tabBar.setExpanding(false);
 
     // top
     tabBar.setShape(QTabBar::RoundedNorth);