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

18 files changed, 543 insertions, 120 deletions

diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 816d375b97..3a1f650351 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -212,7 +212,14 @@ void tst_QFileSystemModel::rootPath()
     QString oldRootPath = model->rootPath();
     const QStringList documentPaths = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation);
     QVERIFY(!documentPaths.isEmpty());
-    const QString documentPath = documentPaths.front();
+    QString documentPath = documentPaths.front();
+    // In particular on Linux, ~/Documents (the first
+    // DocumentsLocation) may not exist, so choose ~ in that case:
+    if (!QFile::exists(documentPath)) {
+        documentPath = QDir::homePath();
+        qWarning("%s: first documentPath \"%s\" does not exist. Using ~ (\"%s\") instead.",
+                 Q_FUNC_INFO, qPrintable(documentPaths.front()), qPrintable(documentPath));
+    }
     root = model->setRootPath(documentPath);
 
     QTRY_VERIFY(model->rowCount(root) >= 0);
diff --git a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp
index 68502f0d8d..060fa51293 100644
--- a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp
+++ b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp
@@ -57,6 +57,8 @@ public:
     virtual ~tst_QProgressDialog();
 
 private slots:
+    void autoShow_data();
+    void autoShow();
     void getSetCheck();
     void task198202();
     void QTBUG_31046();
@@ -70,6 +72,34 @@ tst_QProgressDialog::~tst_QProgressDialog()
 {
 }
 
+void tst_QProgressDialog::autoShow_data()
+{
+    QTest::addColumn<int>("min");
+    QTest::addColumn<int>("max");
+    QTest::addColumn<int>("delay");
+    QTest::addColumn<bool>("expectedAutoShow");
+
+    QTest::newRow("50_to_100_long") << 50 << 100 << 100 << true; // 50*100ms = 5s
+    QTest::newRow("50_to_100_short") << 50 << 1 << 100 << false; // 50*1ms = 50ms
+
+    QTest::newRow("0_to_100_long") << 0 << 100 << 100 << true; // 100*100ms = 10s
+    QTest::newRow("0_to_10_short") << 0 << 10 << 100 << false; // 10*100ms = 1s
+}
+
+void tst_QProgressDialog::autoShow()
+{
+    QFETCH(int, min);
+    QFETCH(int, max);
+    QFETCH(int, delay);
+    QFETCH(bool, expectedAutoShow);
+
+    QProgressDialog dlg("", "", min, max);
+    dlg.setValue(0);
+    QThread::msleep(delay);
+    dlg.setValue(min+1);
+    QCOMPARE(dlg.isVisible(), expectedAutoShow);
+}
+
 // Testing get/set functions
 void tst_QProgressDialog::getSetCheck()
 {
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 4506d0af14..a711bc28e3 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -52,6 +52,8 @@
 #include <QWizard>
 #include <QTreeWidget>
 
+Q_DECLARE_METATYPE(QWizard::WizardButton);
+
 static QImage grabWidget(QWidget *window)
 {
     return window->grab().toImage();
@@ -100,6 +102,8 @@ private slots:
     void setWizardStyle();
     void removePage();
     void sideWidget();
+    void objectNames_data();
+    void objectNames();
 
     // task-specific tests below me:
     void task177716_disableCommitButton();
@@ -2384,6 +2388,44 @@ void tst_QWizard::sideWidget()
     QVERIFY(wizard.sideWidget() == 0);
 }
 
+void tst_QWizard::objectNames_data()
+{
+    QTest::addColumn<QWizard::WizardButton>("wizardButton");
+    QTest::addColumn<QString>("buttonName");
+
+    QTest::newRow("BackButton")    << QWizard::BackButton    << QStringLiteral("__qt__passive_wizardbutton0");
+    QTest::newRow("NextButton")    << QWizard::NextButton    << QStringLiteral("__qt__passive_wizardbutton1");
+    QTest::newRow("CommitButton")  << QWizard::CommitButton  << QStringLiteral("qt_wizard_commit");
+    QTest::newRow("FinishButton")  << QWizard::FinishButton  << QStringLiteral("qt_wizard_finish");
+    QTest::newRow("CancelButton")  << QWizard::CancelButton  << QStringLiteral("qt_wizard_cancel");
+    QTest::newRow("HelpButton")    << QWizard::HelpButton    << QStringLiteral("__qt__passive_wizardbutton5");
+    QTest::newRow("CustomButton1") << QWizard::CustomButton1 << QStringLiteral("__qt__passive_wizardbutton6");
+    QTest::newRow("CustomButton2") << QWizard::CustomButton2 << QStringLiteral("__qt__passive_wizardbutton7");
+    QTest::newRow("CustomButton3") << QWizard::CustomButton3 << QStringLiteral("__qt__passive_wizardbutton8");
+}
+
+void tst_QWizard::objectNames()
+{
+    QFETCH(QWizard::WizardButton, wizardButton);
+    QFETCH(QString, buttonName);
+
+    QWizard wizard;
+    QList<QWizard::WizardButton> buttons = QList<QWizard::WizardButton>()
+        << QWizard::BackButton
+        << QWizard::NextButton
+        << QWizard::CommitButton
+        << QWizard::FinishButton
+        << QWizard::CancelButton
+        << QWizard::HelpButton
+        << QWizard::CustomButton1
+        << QWizard::CustomButton2
+        << QWizard::CustomButton3
+      ;
+    QVERIFY(buttons.contains(wizardButton));
+    QVERIFY(wizard.button(wizardButton));
+    QCOMPARE(wizard.button(wizardButton)->objectName(), buttonName);
+}
+
 class task177716_CommitPage : public QWizardPage
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 4f25aab32a..2798d1e22d 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -6458,6 +6458,12 @@ public:
 
 void tst_QGraphicsItem::ensureUpdateOnTextItem()
 {
+#ifdef Q_OS_MAC
+    if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_7) {
+        QSKIP("This test is unstable on 10.7 in CI");
+    }
+#endif
+
     QGraphicsScene scene;
     QGraphicsView view(&scene);
     view.show();
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index b3fba29f81..dfc8465210 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -4072,6 +4072,7 @@ void tst_QGraphicsScene::isActive()
 
 
     {
+        const QRect availableGeometry = QGuiApplication::primaryScreen()->availableGeometry();
         QWidget toplevel2;
         QHBoxLayout *layout = new QHBoxLayout;
         toplevel2.setLayout(layout);
@@ -4085,12 +4086,13 @@ void tst_QGraphicsScene::isActive()
         QVERIFY(!scene1.hasFocus());
         QVERIFY(!scene2.hasFocus());
 
+        toplevel2.move(availableGeometry.topLeft() + QPoint(50, 50));
         toplevel2.show();
         QApplication::setActiveWindow(&toplevel2);
         QVERIFY(QTest::qWaitForWindowActive(&toplevel2));
         QCOMPARE(QApplication::activeWindow(), &toplevel2);
 
-        QVERIFY(scene1.isActive());
+        QTRY_VERIFY(scene1.isActive());
         QVERIFY(!scene2.isActive());
         QVERIFY(scene1.hasFocus());
         QVERIFY(!scene2.hasFocus());
@@ -4133,6 +4135,7 @@ void tst_QGraphicsScene::isActive()
         QVERIFY(!scene2.hasFocus());
 
         QGraphicsView topLevelView;
+        topLevelView.move(availableGeometry.topLeft() + QPoint(500, 50));
         topLevelView.show();
         QApplication::setActiveWindow(&topLevelView);
         topLevelView.setFocus();
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 7a0ba50ff0..37cc6522a2 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -4687,13 +4687,17 @@ public:
 
 void tst_QGraphicsView::hoverLeave()
 {
+    const QRect availableGeometry = QGuiApplication::primaryScreen()->availableGeometry();
     QGraphicsScene scene;
     QGraphicsView view(&scene);
+    view.resize(160, 160);
+    view.move(availableGeometry.center() - QPoint(80, 80));
     GraphicsItemWithHover *item = new GraphicsItemWithHover;
     scene.addItem(item);
 
     // move the cursor out of the way
-    QCursor::setPos(1,1);
+    const QPoint outOfWindow = view.geometry().topRight() + QPoint(50, 0);
+    QCursor::setPos(outOfWindow);
 
     view.show();
     qApp->setActiveWindow(&view);
@@ -4701,16 +4705,14 @@ void tst_QGraphicsView::hoverLeave()
 
     QPoint pos = view.viewport()->mapToGlobal(view.mapFromScene(item->mapToScene(10, 10)));
     QCursor::setPos(pos);
-    QTest::qWait(200);
-    QVERIFY(item->receivedEnterEvent);
+    QTRY_VERIFY(item->receivedEnterEvent);
     QCOMPARE(item->enterWidget, view.viewport());
 
-    QCursor::setPos(1,1);
-    QTest::qWait(200);
+    QCursor::setPos(outOfWindow);
 #ifdef Q_OS_MAC
     QEXPECT_FAIL("", "QTBUG-26274 - behaviour regression", Abort);
 #endif
-    QVERIFY(item->receivedLeaveEvent);
+    QTRY_VERIFY(item->receivedLeaveEvent);
     QCOMPARE(item->leaveWidget, view.viewport());
 }
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 2dd2089f81..3271b31692 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -53,6 +53,7 @@
 #include <qwidgetaction.h>
 #include <qcommonstyle.h>
 #include <qstylefactory.h>
+#include <qscreen.h>
 
 #include "../../../qtest-config.h"
 
@@ -1780,8 +1781,11 @@ void tst_QGraphicsWidget::verifyFocusChain()
 
 void tst_QGraphicsWidget::updateFocusChainWhenChildDie()
 {
+    const QRect availableGeometry = QGuiApplication::primaryScreen()->availableGeometry();
     QGraphicsScene scene;
     QGraphicsView view(&scene);
+    view.resize(200, 150);
+    view.move(availableGeometry.topLeft() + QPoint(50, 50));
     view.show();
     QApplication::setActiveWindow(&view);
     QVERIFY(QTest::qWaitForWindowActive(&view));
@@ -1801,6 +1805,9 @@ void tst_QGraphicsWidget::updateFocusChainWhenChildDie()
     QVERIFY(w1_1->hasFocus());
     QWidget myWidget(0);
     QLineEdit edit(&myWidget);
+    (new QHBoxLayout(&myWidget))->addWidget(&edit);
+    edit.setMinimumWidth(160); // Windows
+    myWidget.move(availableGeometry.topLeft() + QPoint(350, 50));
     myWidget.show();
     edit.setFocus();
     QTRY_VERIFY(edit.hasFocus());
@@ -1809,8 +1816,9 @@ void tst_QGraphicsWidget::updateFocusChainWhenChildDie()
     w->setParentItem(parent);
     //We don't crash perfect
     QVERIFY(w);
-    QTest::mouseMove(view.viewport());
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0);
+    const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2);
+    QTest::mouseMove(view.viewport(), center);
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, center);
 #ifdef Q_OS_MAC
     QEXPECT_FAIL("", "QTBUG-23699", Continue);
 #endif
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index 0c6d369254..36bf76564f 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -58,17 +58,8 @@
 #include <qscrollbar.h>
 #include <qboxlayout.h>
 #include <qlineedit.h>
-
-// Will try to wait for the condition while allowing event processing
-// for a maximum of 5 seconds.
-#define TRY_COMPARE(expr, expected) \
-    do { \
-        const int step = 50; \
-        for (int q = 0; q < 5000 && ((expr) != (expected)); q+=step) { \
-            QTest::qWait(step); \
-        } \
-        QCOMPARE(expr, expected); \
-    } while(0)
+#include <qscreen.h>
+#include <qscopedpointer.h>
 
 static inline void setFrameless(QWidget *w)
 {
@@ -78,6 +69,22 @@ static inline void setFrameless(QWidget *w)
     w->setWindowFlags(flags);
 }
 
+static inline void centerOnScreen(QWidget *w)
+{
+    const QPoint offset = QPoint(w->width() / 2, w->height() / 2);
+    w->move(QGuiApplication::primaryScreen()->availableGeometry().center() - offset);
+}
+
+// Move cursor out of widget area to avoid undesired interaction on Mac.
+static inline void moveCursorAway(const QWidget *topLevel)
+{
+#ifndef QT_NO_CURSOR
+    QCursor::setPos(topLevel->geometry().topRight() + QPoint(100, 0));
+#else
+    Q_UNUSED(topLevel)
+#endif
+}
+
 class TestView : public QAbstractItemView
 {
     Q_OBJECT
@@ -374,25 +381,27 @@ void tst_QAbstractItemView::emptyModels()
 {
     QFETCH(QString, viewType);
 
-    TestView *view = 0;
+    QScopedPointer<QAbstractItemView> view;
     if (viewType == "QListView")
-        view = reinterpret_cast<TestView*>(new QListView());
+        view.reset(new QListView());
     else if (viewType == "QTableView")
-        view = reinterpret_cast<TestView*>(new QTableView());
+        view.reset(new QTableView());
     else if (viewType == "QTreeView")
-        view = reinterpret_cast<TestView*>(new QTreeView());
+        view.reset(new QTreeView());
     else if (viewType == "QHeaderView")
-        view = reinterpret_cast<TestView*>(new QHeaderView(Qt::Vertical));
+        view.reset(new QHeaderView(Qt::Vertical));
     else
         QVERIFY(0);
+    centerOnScreen(view.data());
+    moveCursorAway(view.data());
     view->show();
+    QVERIFY(QTest::qWaitForWindowExposed(view.data()));
 
     QVERIFY(!view->model());
     QVERIFY(!view->selectionModel());
     //QVERIFY(view->itemDelegate() != 0);
 
-    basic_tests(view);
-    delete view;
+    basic_tests(reinterpret_cast<TestView*>(view.data()));
 }
 
 void tst_QAbstractItemView::setModel_data()
@@ -408,24 +417,28 @@ void tst_QAbstractItemView::setModel_data()
 void tst_QAbstractItemView::setModel()
 {
     QFETCH(QString, viewType);
-    TestView *view = 0;
+
+    QScopedPointer<QAbstractItemView> view;
+
     if (viewType == "QListView")
-        view = reinterpret_cast<TestView*>(new QListView());
+        view.reset(new QListView());
     else if (viewType == "QTableView")
-        view = reinterpret_cast<TestView*>(new QTableView());
+        view.reset(new QTableView());
     else if (viewType == "QTreeView")
-        view = reinterpret_cast<TestView*>(new QTreeView());
+        view.reset(new QTreeView());
     else if (viewType == "QHeaderView")
-        view = reinterpret_cast<TestView*>(new QHeaderView(Qt::Vertical));
+        view.reset(new QHeaderView(Qt::Vertical));
     else
         QVERIFY(0);
+    centerOnScreen(view.data());
+    moveCursorAway(view.data());
     view->show();
+    QVERIFY(QTest::qWaitForWindowExposed(view.data()));
 
     QStandardItemModel model(20,20);
     view->setModel(0);
     view->setModel(&model);
-    basic_tests(view);
-    delete view;
+    basic_tests(reinterpret_cast<TestView*>(view.data()));
 }
 
 void tst_QAbstractItemView::basic_tests(TestView *view)
@@ -636,7 +649,10 @@ void tst_QAbstractItemView::noModel()
     view.setModel(&model);
     // Make the viewport smaller than the contents, so that we can scroll
     view.resize(100,100);
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // make sure that the scrollbars are not at value 0
     view.scrollTo(view.model()->index(10,10));
@@ -656,7 +672,10 @@ void tst_QAbstractItemView::dragSelect()
 
     QTableView view;
     view.setModel(&model);
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.setVisible(true);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     const int delay = 2;
     for (int i = 0; i < 2; ++i) {
@@ -677,7 +696,10 @@ void tst_QAbstractItemView::rowDelegate()
     QTableView view;
     view.setModel(&model);
     view.setItemDelegateForRow(3, &delegate);
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QModelIndex index = model.index(3, 0);
     view.openPersistentEditor(index);
@@ -694,7 +716,10 @@ void tst_QAbstractItemView::columnDelegate()
     QTableView view;
     view.setModel(&model);
     view.setItemDelegateForColumn(3, &delegate);
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QModelIndex index = model.index(0, 3);
     view.openPersistentEditor(index);
@@ -747,11 +772,13 @@ void tst_QAbstractItemView::persistentEditorFocus()
 
     view.setCurrentIndex(model.index(0, 0));
     QCOMPARE(view.currentIndex(), model.index(0, 0));
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.show();
-    QTRY_VERIFY(view.isVisible());
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     for (int i = 0; i < list.count(); ++i) {
-        TRY_COMPARE(list.at(i)->isVisible(), true);
+        QTRY_VERIFY(list.at(i)->isVisible());
         QPoint p = QPoint(5, 5);
         QMouseEvent mouseEvent(QEvent::MouseButtonPress, p, Qt::LeftButton,
                                Qt::LeftButton, Qt::NoModifier);
@@ -1045,6 +1072,8 @@ void tst_QAbstractItemView::setItemDelegate()
             }
         }
     }
+    centerOnScreen(&v);
+    moveCursorAway(&v);
     v.show();
 #ifdef Q_WS_X11
     QCursor::setPos(v.geometry().center());
@@ -1056,7 +1085,7 @@ void tst_QAbstractItemView::setItemDelegate()
     v.edit(index);
 
     // This will close the editor
-    TRY_COMPARE(QApplication::focusWidget() == 0, false);
+    QTRY_VERIFY(QApplication::focusWidget());
     QWidget *editor = QApplication::focusWidget();
     QVERIFY(editor);
     editor->hide();
@@ -1122,20 +1151,25 @@ void tst_QAbstractItemView::setCurrentIndex()
     QFETCH(int, itemFlags);
     QFETCH(bool, result);
 
-    TestView *view = 0;
+    QScopedPointer<QAbstractItemView> view;
+
     if (viewType == "QListView")
-        view = reinterpret_cast<TestView*>(new QListView());
+        view.reset(new QListView());
     else if (viewType == "QTableView")
-        view = reinterpret_cast<TestView*>(new QTableView());
+        view.reset(new QTableView());
     else if (viewType == "QTreeView")
-        view = reinterpret_cast<TestView*>(new QTreeView());
+        view.reset(new QTreeView());
     else if (viewType == "QHeaderView")
-        view = reinterpret_cast<TestView*>(new QHeaderView(Qt::Vertical));
+        view.reset(new QHeaderView(Qt::Vertical));
     else
         QVERIFY(0);
+
+    centerOnScreen(view.data());
+    moveCursorAway(view.data());
     view->show();
+    QVERIFY(QTest::qWaitForWindowExposed(view.data()));
 
-    QStandardItemModel *model = new QStandardItemModel(view);
+    QStandardItemModel *model = new QStandardItemModel(view.data());
     QStandardItem *item = new QStandardItem("first item");
     item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
     model->appendRow(item);
@@ -1150,8 +1184,6 @@ void tst_QAbstractItemView::setCurrentIndex()
     QVERIFY(view->currentIndex() == model->index(0,0));
     view->setCurrentIndex(model->index(1,0));
     QVERIFY(view->currentIndex() == model->index(result ? 1 : 0,0));
-
-    delete view;
 }
 
 void tst_QAbstractItemView::task221955_selectedEditor()
@@ -1170,11 +1202,13 @@ void tst_QAbstractItemView::task221955_selectedEditor()
     tree.setItemWidget(dummy, 0, button = new QPushButton("More..."));
     button->setAutoFillBackground(true);  // as recommended in doc
 
+    centerOnScreen(&tree);
+    moveCursorAway(&tree);
     tree.show();
     tree.setFocus();
     tree.setCurrentIndex(tree.model()->index(1,0));
-    QTest::qWait(100);
     QApplication::setActiveWindow(&tree);
+    QVERIFY(QTest::qWaitForWindowActive(&tree));
 
     QVERIFY(! tree.selectionModel()->selectedIndexes().contains(tree.model()->index(3,0)));
 
@@ -1218,9 +1252,11 @@ void tst_QAbstractItemView::task250754_fontChange()
     }
     tree.setModel(m);
 
+    w.resize(160, 240); // Minimum width for windows with frame on Windows 8
+    centerOnScreen(&w);
+    moveCursorAway(&w);
     w.show();
-    w.resize(150,240);
-    QTest::qWait(30);
+    QVERIFY(QTest::qWaitForWindowExposed(&w));
     QFont font = tree.font();
     font.setPixelSize(10);
     tree.setFont(font);
@@ -1244,8 +1280,10 @@ void tst_QAbstractItemView::task200665_itemEntered()
     QStandardItemModel model(1000,1);
     QListView view;
     view.setModel(&model);
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.show();
-    QTest::qWait(200);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
     QRect rect = view.visualRect(model.index(0,0));
     QCursor::setPos( view.viewport()->mapToGlobal(rect.center()) );
     QSignalSpy spy(&view, SIGNAL(entered(QModelIndex)));
@@ -1267,7 +1305,10 @@ void tst_QAbstractItemView::task257481_emptyEditor()
     QTreeView treeView;
     treeView.setRootIsDecorated(false);
     treeView.setModel(&model);
+    centerOnScreen(&treeView);
+    moveCursorAway(&treeView);
     treeView.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&treeView));
 
     treeView.edit(model.index(0,0));
     QList<QLineEdit *> lineEditors = treeView.viewport()->findChildren<QLineEdit *>();
@@ -1298,14 +1339,16 @@ void tst_QAbstractItemView::shiftArrowSelectionAfterScrolling()
     }
 
     QListView view;
-    view.setFixedSize(150, 250);
+    view.setFixedSize(160, 250); // Minimum width for windows with frame on Windows 8
     view.setFlow(QListView::LeftToRight);
     view.setGridSize(QSize(100, 100));
     view.setSelectionMode(QListView::ExtendedSelection);
     view.setViewMode(QListView::IconMode);
     view.setModel(&model);
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.show();
-    QTest::qWait(30);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QModelIndex index0 = model.index(0, 0);
     QModelIndex index1 = model.index(1, 0);
@@ -1333,14 +1376,16 @@ void tst_QAbstractItemView::shiftSelectionAfterRubberbandSelection()
     }
 
     QListView view;
-    view.setFixedSize(150, 450);
+    view.setFixedSize(160, 450); // Minimum width for windows with frame on Windows 8
     view.setFlow(QListView::LeftToRight);
     view.setGridSize(QSize(100, 100));
     view.setSelectionMode(QListView::ExtendedSelection);
     view.setViewMode(QListView::IconMode);
     view.setModel(&model);
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.show();
-    QTest::qWait(30);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QModelIndex index0 = model.index(0, 0);
     QModelIndex index1 = model.index(1, 0);
@@ -1408,14 +1453,16 @@ void tst_QAbstractItemView::ctrlRubberbandSelection()
     }
 
     QListView view;
-    view.setFixedSize(150, 450);
+    view.setFixedSize(160, 450); // Minimum width for windows with frame on Windows 8
     view.setFlow(QListView::LeftToRight);
     view.setGridSize(QSize(100, 100));
     view.setSelectionMode(QListView::ExtendedSelection);
     view.setViewMode(QListView::IconMode);
     view.setModel(&model);
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.show();
-    QTest::qWait(30);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QModelIndex index1 = model.index(1, 0);
     QModelIndex index2 = model.index(2, 0);
@@ -1454,6 +1501,8 @@ void tst_QAbstractItemView::QTBUG6407_extendedSelection()
     font.setPixelSize(10);
     view.setFont(font);
     view.resize(200,240);
+    centerOnScreen(&view);
+    moveCursorAway(&view);
 
     view.show();
     QApplication::setActiveWindow(&view);
@@ -1493,7 +1542,11 @@ void tst_QAbstractItemView::QTBUG6753_selectOnSelection()
         for (int j = 0; j < table.columnCount(); ++j)
             table.setItem(i, j, new QTableWidgetItem("choo-be-doo-wah"));
 
+    centerOnScreen(&table);
+    moveCursorAway(&table);
     table.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&table));
+
     table.setSelectionMode(QAbstractItemView::ExtendedSelection);
     table.selectAll();
     QVERIFY(QTest::qWaitForWindowExposed(&table));
@@ -1523,6 +1576,8 @@ void tst_QAbstractItemView::testClickedSignal()
 {
     QTableWidget view(5, 5);
 
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.show();
     QApplication::setActiveWindow(&view);
     QVERIFY(QTest::qWaitForWindowActive(&view));
@@ -1591,6 +1646,8 @@ void tst_QAbstractItemView::testChangeEditorState()
     view.setEditTriggers(QAbstractItemView::CurrentChanged);
     view.setItemDelegate(new StateChangeDelegate);
     view.setModel(&model);
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.show();
     QApplication::setActiveWindow(&view);
     QVERIFY(QTest::qWaitForWindowActive(&view));
@@ -1607,7 +1664,10 @@ void tst_QAbstractItemView::deselectInSingleSelection()
     s.setRowCount(10);
     s.setColumnCount(10);
     view.setModel(&s);
+    centerOnScreen(&view);
+    moveCursorAway(&view);
     view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
     view.setSelectionMode(QAbstractItemView::SingleSelection);
     view.setEditTriggers(QAbstractItemView::NoEditTriggers);
     QApplication::setActiveWindow(&view);
@@ -1650,6 +1710,8 @@ void tst_QAbstractItemView::testNoActivateOnDisabledItem()
     model.setItem(0, 0, item);
     item->setFlags(Qt::NoItemFlags);
     treeView.setModel(&model);
+    centerOnScreen(&treeView);
+    moveCursorAway(&treeView);
     treeView.show();
 
     QApplication::setActiveWindow(&treeView);
diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index 398b1b4d98..3e6df0f136 100644
--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
@@ -368,6 +368,8 @@ void tst_QHeaderView::getSetCheck()
     QCOMPARE(0, obj1.minimumSectionSize());
     obj1.setMinimumSectionSize(99999);
     QCOMPARE(99999, obj1.minimumSectionSize());
+    obj1.setMinimumSectionSize(-1);
+    QVERIFY(obj1.minimumSectionSize() < 100);
 
     // int QHeaderView::offset()
     // void QHeaderView::setOffset(int)
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 8d31fcdf13..ccdce1fe0c 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -259,6 +259,7 @@ private slots:
     void taskQTBUG_25333_adjustViewOptionsForIndex();
     void taskQTBUG_18539_emitLayoutChanged();
     void taskQTBUG_8176_emitOnExpandAll();
+    void taskQTBUG_34717_collapseAtBottom();
     void testInitialFocus();
 };
 
@@ -4240,6 +4241,35 @@ void tst_QTreeView::taskQTBUG_8176_emitOnExpandAll()
     QCOMPARE(spy2.size(), 1); // item2 is collapsed
 }
 
+// From QTBUG_34717 (QTreeWidget crashes when scrolling to the end
+// of an expanded tree, then collapse all)
+// The test passes simply if it doesn't crash.
+void tst_QTreeView::taskQTBUG_34717_collapseAtBottom()
+{
+    QTreeWidget treeWidget;
+    treeWidget.header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    treeWidget.setColumnCount(2);
+    QTreeWidgetItem *mainItem = new QTreeWidgetItem(&treeWidget, QStringList() << "Root");
+    for (int i = 0; i < 200; ++i) {
+        QTreeWidgetItem *item = new QTreeWidgetItem(mainItem, QStringList(QString("Item")));
+        new QTreeWidgetItem(item, QStringList() << "Child" << "1");
+        new QTreeWidgetItem(item, QStringList() << "Child" << "2");
+        new QTreeWidgetItem(item, QStringList() << "Child" << "3");
+    }
+    treeWidget.show();
+    treeWidget.expandAll();
+    treeWidget.scrollToBottom();
+    treeWidget.collapseAll();
+
+    treeWidget.setAnimated(true);
+    treeWidget.expandAll();
+    treeWidget.scrollToBottom();
+    mainItem->setExpanded(false);
+
+    PublicView *pview = (PublicView*) &treeWidget;
+    QVERIFY(pview->sizeHintForColumn(1) >= 0);
+}
+
 void tst_QTreeView::testInitialFocus()
 {
     QTreeWidget treeWidget;
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 16bd4a6f7b..e13dfe836f 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -153,6 +153,7 @@ private slots:
 
     void focusChanged();
     void focusOut();
+    void focusMouseClick();
 
     void execAfterExit();
 
@@ -1773,6 +1774,63 @@ void tst_QApplication::focusOut()
     QTest::qWait(2000);
 }
 
+class SpontaneousEvent
+{
+    Q_GADGET
+    QDOC_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
+    Q_ENUMS(Type)
+public:
+    enum Type {
+        Void
+    };
+
+    virtual ~SpontaneousEvent() {}
+
+    QEventPrivate *d;
+    ushort t;
+
+    ushort posted : 1;
+    ushort spont : 1;
+};
+
+void tst_QApplication::focusMouseClick()
+{
+    int argc = 1;
+    QApplication app(argc, &argv0);
+
+    QWidget w;
+    w.setFocusPolicy(Qt::StrongFocus);
+    QWidget w2(&w);
+    w2.setFocusPolicy(Qt::TabFocus);
+    w.show();
+    w.setFocus();
+    QTRY_COMPARE(QApplication::focusWidget(), &w);
+
+    // front most widget has Qt::TabFocus, parent widget accepts clicks as well
+    // now send a mouse button press event and check what happens with the focus
+    // it should be given to the parent widget
+    QMouseEvent ev(QEvent::MouseButtonPress, QPointF(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+    reinterpret_cast<SpontaneousEvent *>(&ev)->spont = 1;
+    QVERIFY(ev.spontaneous());
+    qApp->notify(&w2, &ev);
+    QCOMPARE(QApplication::focusWidget(), &w);
+
+    // then we give the inner widget strong focus -> it should get focus
+    w2.setFocusPolicy(Qt::StrongFocus);
+    reinterpret_cast<SpontaneousEvent *>(&ev)->spont = 1;
+    QVERIFY(ev.spontaneous());
+    qApp->notify(&w2, &ev);
+    QTRY_COMPARE(QApplication::focusWidget(), &w2);
+
+    // now back to tab focus and click again (it already had focus) -> focus should stay
+    // (focus was revoked as of QTBUG-34042)
+    w2.setFocusPolicy(Qt::TabFocus);
+    reinterpret_cast<SpontaneousEvent *>(&ev)->spont = 1;
+    QVERIFY(ev.spontaneous());
+    qApp->notify(&w2, &ev);
+    QCOMPARE(QApplication::focusWidget(), &w2);
+}
+
 void tst_QApplication::execAfterExit()
 {
     int argc = 1;
diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index 135605f185..d04b812878 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -47,6 +47,7 @@
 #include <qproxystyle.h>
 #include <qsizepolicy.h>
 
+#include <QtWidgets/QCheckBox>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QPushButton>
@@ -347,6 +348,19 @@ void tst_QFormLayout::spacing()
     style->hspacing = 20;
     //QCOMPARE(fl->spacing(), 20);
 
+
+
+    // Do not assert if spacings are negative (QTBUG-34731)
+    style->vspacing = -1;
+    style->hspacing = -1;
+    QLabel *label = new QLabel(tr("Asserts"));
+    QCheckBox *checkBox = new QCheckBox(tr("Yes"));
+    fl->setWidget(0, QFormLayout::LabelRole, label);
+    fl->setWidget(1, QFormLayout::FieldRole, checkBox);
+    w->resize(200, 100);
+    w->show();
+    QVERIFY(QTest::qWaitForWindowExposed(w));
+
     delete w;
     delete style;
 }
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 2da8df6116..de028aa462 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -75,6 +75,7 @@
 #include <qproxystyle.h>
 #include <QtWidgets/QGraphicsView>
 #include <QtWidgets/QGraphicsProxyWidget>
+#include <QtGui/qwindow.h>
 
 #include "../../../qtest-config.h"
 
@@ -172,6 +173,24 @@ static inline void centerOnScreen(QWidget *w)
     w->move(QGuiApplication::primaryScreen()->availableGeometry().center() - offset);
 }
 
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT)
+static inline void setWindowsAnimationsEnabled(bool enabled)
+{
+    ANIMATIONINFO animation = { sizeof(ANIMATIONINFO), enabled };
+    SystemParametersInfo(SPI_SETANIMATION, 0, &animation, 0);
+}
+
+static inline bool windowsAnimationsEnabled()
+{
+    ANIMATIONINFO animation = { sizeof(ANIMATIONINFO), 0 };
+    SystemParametersInfo(SPI_GETANIMATION, 0, &animation, 0);
+    return animation.iMinAnimate;
+}
+#else // Q_OS_WIN && !Q_OS_WINCE && !Q_OS_WINRT
+inline void setWindowsAnimationsEnabled(bool) {}
+static inline bool windowsAnimationsEnabled() { return false; }
+#endif // !Q_OS_WIN || Q_OS_WINCE || Q_OS_WINRT
+
 class tst_QWidget : public QObject
 {
     Q_OBJECT
@@ -427,6 +446,7 @@ private:
     QWidget *testWidget;
 
     const QString m_platform;
+    const bool m_windowsAnimationsEnabled;
 };
 
 bool tst_QWidget::ensureScreenSize(int width, int height)
@@ -581,8 +601,12 @@ void tst_QWidget::getSetCheck()
 #endif
 }
 
-tst_QWidget::tst_QWidget() : m_platform(qApp->platformName().toLower())
+tst_QWidget::tst_QWidget()
+    : m_platform(qApp->platformName().toLower())
+    , m_windowsAnimationsEnabled(windowsAnimationsEnabled())
 {
+    if (m_windowsAnimationsEnabled) // Disable animations which can interfere with screen grabbing in moveChild(), showAndMoveChild()
+        setWindowsAnimationsEnabled(false);
     QFont font;
     font.setBold(true);
     font.setPointSize(42);
@@ -598,6 +622,8 @@ tst_QWidget::tst_QWidget() : m_platform(qApp->platformName().toLower())
 
 tst_QWidget::~tst_QWidget()
 {
+    if (m_windowsAnimationsEnabled)
+        setWindowsAnimationsEnabled(m_windowsAnimationsEnabled);
 }
 
 class BezierViewer : public QWidget {
@@ -4753,8 +4779,8 @@ void tst_QWidget::windowMoveResize()
 class ColorWidget : public QWidget
 {
 public:
-    ColorWidget(QWidget *parent = 0, const QColor &c = QColor(Qt::red))
-        : QWidget(parent, Qt::FramelessWindowHint), color(c), enters(0), leaves(0)
+    ColorWidget(QWidget *parent = 0, Qt::WindowFlags f = 0, const QColor &c = QColor(Qt::red))
+        : QWidget(parent, f), color(c), enters(0), leaves(0)
     {
         QPalette opaquePalette = palette();
         opaquePalette.setColor(backgroundRole(), color);
@@ -4785,31 +4811,79 @@ public:
     int leaves;
 };
 
-#define VERIFY_COLOR(region, color) {                                   \
+static inline QByteArray msgRgbMismatch(unsigned actual, unsigned expected)
+{
+    return QByteArrayLiteral("Color mismatch, 0x") + QByteArray::number(actual, 16) +
+           QByteArrayLiteral(" != 0x") + QByteArray::number(expected, 16);
+}
+
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT)
+QT_BEGIN_NAMESPACE
+extern Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0);
+QT_END_NAMESPACE
+
+// grabs the window *without including any overlapping windows*
+static QPixmap grabWindow(QWindow *window, int x, int y, int width, int height)
+{
+    const HWND hwnd = (HWND)window->winId();
+
+    // Create and setup bitmap
+    const HDC displayDc = ::GetDC(0);
+    const HDC bitmapDc = ::CreateCompatibleDC(displayDc);
+    const HBITMAP bitmap = ::CreateCompatibleBitmap(displayDc, width, height);
+    const HGDIOBJ oldBitmap = ::SelectObject(bitmapDc, bitmap);
+
+    // copy data
+    const HDC windowDc = ::GetDC(hwnd);
+    ::BitBlt(bitmapDc, 0, 0, width, height, windowDc, x, y, SRCCOPY);
+
+    // clean up all but bitmap
+    ::ReleaseDC(hwnd, windowDc);
+    ::SelectObject(bitmapDc, oldBitmap);
+    ::DeleteDC(bitmapDc);
+
+    const QPixmap pixmap = qt_pixmapFromWinHBITMAP(bitmap);
+
+    ::DeleteObject(bitmap);
+    ::ReleaseDC(0, displayDc);
+
+    return pixmap;
+}
+#else
+// fallback for other platforms.
+static QPixmap grabWindow(QWindow *window, int x, int y, int width, int height)
+{
+    QScreen *screen = window->screen();
+    return screen ? screen->grabWindow(window->winId(), x, y, width, height) : QPixmap();
+}
+#endif  //defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT)
+
+#define VERIFY_COLOR(child, region, color) do {  \
     const QRegion r = QRegion(region);                                  \
-    QScreen *screen = qApp->primaryScreen();                            \
-    const WId desktopWinId = QDesktopWidget().winId();                      \
+    QWindow *window = child.window()->windowHandle();                   \
+    Q_ASSERT(window);                                                   \
+    const QPoint offset = child.mapTo(child.window(), QPoint(0,0));     \
     for (int i = 0; i < r.rects().size(); ++i) {                        \
-        const QRect rect = r.rects().at(i);                             \
+        const QRect rect = r.rects().at(i).translated(offset);          \
         for (int t = 0; t < 5; t++) {                                   \
-            const QPixmap pixmap = screen->grabWindow(desktopWinId,     \
-                                                   rect.left(), rect.top(), \
-                                                   rect.width(), rect.height()); \
+            const QPixmap pixmap = grabWindow(window,                   \
+                                              rect.left(), rect.top(),  \
+                                              rect.width(), rect.height()); \
             QCOMPARE(pixmap.size(), rect.size());                       \
             QPixmap expectedPixmap(pixmap); /* ensure equal formats */  \
-            expectedPixmap.detach(); \
+            expectedPixmap.detach();                                    \
             expectedPixmap.fill(color);                                 \
-            QImage image = pixmap.toImage();                          \
+            QImage image = pixmap.toImage();                            \
             uint alphaCorrection = image.format() == QImage::Format_RGB32 ? 0xff000000 : 0; \
-            uint firstPixel = image.pixel(0,0) | alphaCorrection;        \
-            if ( firstPixel != QColor(color).rgb() && t < 4 )          \
+            uint firstPixel = image.pixel(0,0) | alphaCorrection;       \
+            if ( firstPixel != QColor(color).rgb() && t < 4 )           \
             { QTest::qWait(200); continue; }                            \
-            QCOMPARE(firstPixel, QColor(color).rgb());                  \
+            QVERIFY2(firstPixel == QColor(color).rgb(), msgRgbMismatch(firstPixel, QColor(color).rgb()));  \
             QCOMPARE(pixmap, expectedPixmap);                           \
             break;                                                      \
         }                                                               \
     }                                                                   \
-}
+} while (0)
 
 void tst_QWidget::popupEnterLeave()
 {
@@ -4817,7 +4891,7 @@ void tst_QWidget::popupEnterLeave()
     parent.setWindowFlags(Qt::FramelessWindowHint);
     parent.setGeometry(10, 10, 200, 100);
 
-    ColorWidget alien(&parent, Qt::black);
+    ColorWidget alien(&parent, Qt::Widget, Qt::black);
     alien.setGeometry(0, 0, 10, 10);
     alien.show();
 
@@ -4868,34 +4942,32 @@ void tst_QWidget::moveChild_data()
 
 void tst_QWidget::moveChild()
 {
-#if defined(UBUNTU_ONEIRIC)
-    QSKIP("QTBUG-30566 - Unstable auto-test");
-#endif
     QFETCH(QPoint, offset);
 
-    ColorWidget parent;
+    ColorWidget parent(0, Qt::Window | Qt::WindowStaysOnTopHint);
     // prevent custom styles
     parent.setStyle(QStyleFactory::create(QLatin1String("Windows")));
-    ColorWidget child(&parent, Qt::blue);
+    ColorWidget child(&parent, Qt::Widget, Qt::blue);
 
 #ifndef Q_OS_WINCE
-    parent.setGeometry(QRect(QPoint(QApplication::desktop()->availableGeometry(&parent).topLeft()),
-                             QSize(100, 100)));
+    parent.setGeometry(QRect(QPoint(QApplication::desktop()->availableGeometry(&parent).topLeft()) + QPoint(50, 50),
+                             QSize(200, 200)));
 #else
     parent.setGeometry(60, 60, 150, 150);
 #endif
     child.setGeometry(25, 25, 50, 50);
+#ifndef QT_NO_CURSOR // Try to make sure the cursor is not in a taskbar area to prevent tooltips or window highlighting
+    QCursor::setPos(parent.geometry().topRight() + QPoint(50 , 50));
+#endif
     parent.show();
     QVERIFY(QTest::qWaitForWindowExposed(&parent));
     QTest::qWait(30);
-    const QPoint tlwOffset = parent.geometry().topLeft();
 
     QTRY_COMPARE(parent.r, QRegion(parent.rect()) - child.geometry());
     QTRY_COMPARE(child.r, QRegion(child.rect()));
-    VERIFY_COLOR(child.geometry().translated(tlwOffset),
+    VERIFY_COLOR(child, child.rect(),
                  child.color);
-    VERIFY_COLOR(QRegion(parent.geometry()) - child.geometry().translated(tlwOffset),
-                 parent.color);
+    VERIFY_COLOR(parent, QRegion(parent.rect()) - child.geometry(), parent.color);
     parent.reset();
     child.reset();
 
@@ -4913,10 +4985,8 @@ void tst_QWidget::moveChild()
     // should be scrolled in backingstore
     QCOMPARE(child.r, QRegion());
 #endif
-    VERIFY_COLOR(child.geometry().translated(tlwOffset),
-                child.color);
-    VERIFY_COLOR(QRegion(parent.geometry()) - child.geometry().translated(tlwOffset),
-                parent.color);
+    VERIFY_COLOR(child, child.rect(), child.color);
+    VERIFY_COLOR(parent, QRegion(parent.rect()) - child.geometry(), parent.color);
 }
 
 void tst_QWidget::showAndMoveChild()
@@ -4924,7 +4994,7 @@ void tst_QWidget::showAndMoveChild()
 #if defined(UBUNTU_ONEIRIC)
     QSKIP("QTBUG-30566 - Unstable auto-test");
 #endif
-    QWidget parent(0, Qt::FramelessWindowHint);
+    QWidget parent(0, Qt::Window | Qt::WindowStaysOnTopHint);
     // prevent custom styles
     parent.setStyle(QStyleFactory::create(QLatin1String("Windows")));
 
@@ -4932,6 +5002,9 @@ void tst_QWidget::showAndMoveChild()
     QRect desktopDimensions = desktop.availableGeometry(&parent);
     desktopDimensions = desktopDimensions.adjusted(64, 64, -64, -64);
 
+#ifndef QT_NO_CURSOR // Try to make sure the cursor is not in a taskbar area to prevent tooltips or window highlighting
+    QCursor::setPos(desktopDimensions.topRight() + QPoint(40, 40));
+#endif
     parent.setGeometry(desktopDimensions);
     parent.setPalette(Qt::red);
     parent.show();
@@ -4939,7 +5012,6 @@ void tst_QWidget::showAndMoveChild()
     QVERIFY(QTest::qWaitForWindowActive(&parent));
     QTest::qWait(10);
 
-    const QPoint tlwOffset = parent.geometry().topLeft();
     QWidget child(&parent);
     child.resize(desktopDimensions.width()/2, desktopDimensions.height()/2);
     child.setPalette(Qt::blue);
@@ -4951,8 +5023,8 @@ void tst_QWidget::showAndMoveChild()
     child.move(desktopDimensions.width()/2, desktopDimensions.height()/2);
     qApp->processEvents();
 
-    VERIFY_COLOR(child.geometry().translated(tlwOffset), Qt::blue);
-    VERIFY_COLOR(QRegion(parent.geometry()) - child.geometry().translated(tlwOffset), Qt::red);
+    VERIFY_COLOR(child, child.rect(), Qt::blue);
+    VERIFY_COLOR(parent, QRegion(parent.rect()) - child.geometry(), Qt::red);
 }
 
 // Cocoa only has rect granularity.
@@ -4962,13 +5034,13 @@ void tst_QWidget::subtractOpaqueSiblings()
     QWidget w;
     w.setGeometry(50, 50, 300, 300);
 
-    ColorWidget *large = new ColorWidget(&w, Qt::red);
+    ColorWidget *large = new ColorWidget(&w, Qt::Widget, Qt::red);
     large->setGeometry(50, 50, 200, 200);
 
-    ColorWidget *medium = new ColorWidget(large, Qt::gray);
+    ColorWidget *medium = new ColorWidget(large, Qt::Widget, Qt::gray);
     medium->setGeometry(50, 50, 100, 100);
 
-    ColorWidget *tall = new ColorWidget(&w, Qt::blue);
+    ColorWidget *tall = new ColorWidget(&w, Qt::Widget, Qt::blue);
     tall->setGeometry(100, 30, 50, 100);
 
     w.show();
@@ -7051,7 +7123,7 @@ void tst_QWidget::repaintWhenChildDeleted()
         QTest::qWait(1000);
     }
 #endif
-    ColorWidget w(0, Qt::red);
+    ColorWidget w(0, Qt::FramelessWindowHint, Qt::red);
 #if !defined(Q_OS_WINCE)
     QPoint startPoint = QApplication::desktop()->availableGeometry(&w).topLeft();
     startPoint.rx() += 50;
@@ -7067,7 +7139,7 @@ void tst_QWidget::repaintWhenChildDeleted()
     w.r = QRegion();
 
     {
-        ColorWidget child(&w, Qt::blue);
+        ColorWidget child(&w, Qt::Widget, Qt::blue);
         child.setGeometry(10, 10, 10, 10);
         child.show();
         QTest::qWait(10);
@@ -7082,7 +7154,7 @@ void tst_QWidget::repaintWhenChildDeleted()
 // task 175114
 void tst_QWidget::hideOpaqueChildWhileHidden()
 {
-    ColorWidget w(0, Qt::red);
+    ColorWidget w(0, Qt::FramelessWindowHint, Qt::red);
 #if !defined(Q_OS_WINCE)
     QPoint startPoint = QApplication::desktop()->availableGeometry(&w).topLeft();
     startPoint.rx() += 50;
@@ -7092,10 +7164,10 @@ void tst_QWidget::hideOpaqueChildWhileHidden()
     w.setGeometry(60, 60, 110, 110);
 #endif
 
-    ColorWidget child(&w, Qt::blue);
+    ColorWidget child(&w, Qt::Widget, Qt::blue);
     child.setGeometry(10, 10, 80, 80);
 
-    ColorWidget child2(&child, Qt::white);
+    ColorWidget child2(&child, Qt::Widget, Qt::white);
     child2.setGeometry(10, 10, 60, 60);
 
     w.show();
@@ -9782,18 +9854,16 @@ void tst_QWidget::underMouse()
     // Move the mouse cursor to a safe location
     QCursor::setPos(0,0);
 
-    ColorWidget topLevelWidget(0, Qt::blue);
-    ColorWidget childWidget1(&topLevelWidget, Qt::yellow);
-    ColorWidget childWidget2(&topLevelWidget, Qt::black);
-    ColorWidget popupWidget(0, Qt::green);
+    ColorWidget topLevelWidget(0, Qt::FramelessWindowHint, Qt::blue);
+    ColorWidget childWidget1(&topLevelWidget, Qt::Widget, Qt::yellow);
+    ColorWidget childWidget2(&topLevelWidget, Qt::Widget, Qt::black);
+    ColorWidget popupWidget(0, Qt::Popup, Qt::green);
 
     topLevelWidget.setObjectName("topLevelWidget");
     childWidget1.setObjectName("childWidget1");
     childWidget2.setObjectName("childWidget2");
     popupWidget.setObjectName("popupWidget");
 
-    popupWidget.setWindowFlags(Qt::Popup);
-
     topLevelWidget.setGeometry(100, 100, 300, 300);
     childWidget1.setGeometry(20, 20, 100, 100);
     childWidget2.setGeometry(20, 120, 100, 100);
diff --git a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
index c17a03e058..cd6433bbe7 100644
--- a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
+++ b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
@@ -46,6 +46,8 @@
 #include <qwindow.h>
 #include <qwidget.h>
 
+#include <qdockwidget.h>
+#include <qmainwindow.h>
 
 
 class Window : public QWindow
@@ -80,6 +82,7 @@ private slots:
     void testUnparenting();
     void testActivation();
     void testAncestorChange();
+    void testDockWidget();
 };
 
 
@@ -278,6 +281,7 @@ void tst_QWindowContainer::testAncestorChange()
     newRoot->setGeometry(100, 100, 200, 200);
     newRoot->show();
     QVERIFY(QTest::qWaitForWindowExposed(newRoot));
+    QCOMPARE(newRoot->windowHandle(), window->parent());
     //      newRoot
     //      + right
     //        + container
@@ -285,6 +289,31 @@ void tst_QWindowContainer::testAncestorChange()
     QCOMPARE(window->geometry(), QRect(100, 0, 100, 100));
 }
 
+
+void tst_QWindowContainer::testDockWidget()
+{
+    QMainWindow mainWindow;
+    mainWindow.resize(200, 200);
+
+    QDockWidget *dock = new QDockWidget();
+    QWindow *window = new QWindow();
+    QWidget *container = QWidget::createWindowContainer(window);
+    dock->setWidget(container);
+    mainWindow.addDockWidget(Qt::RightDockWidgetArea, dock);
+
+    mainWindow.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&mainWindow));
+    QVERIFY(window->parent() == mainWindow.window()->windowHandle());
+
+    QTest::qWait(1000);
+    dock->setFloating(true);
+    QTRY_VERIFY(window->parent() != mainWindow.window()->windowHandle());
+
+    QTest::qWait(1000);
+    dock->setFloating(false);
+    QTRY_VERIFY(window->parent() == mainWindow.window()->windowHandle());
+}
+
 QTEST_MAIN(tst_QWindowContainer)
 
 #include "tst_qwindowcontainer.moc"
diff --git a/tests/auto/widgets/widgets/qkeysequenceedit/tst_qkeysequenceedit.cpp b/tests/auto/widgets/widgets/qkeysequenceedit/tst_qkeysequenceedit.cpp
index 8c010abfe6..1434d98e59 100644
--- a/tests/auto/widgets/widgets/qkeysequenceedit/tst_qkeysequenceedit.cpp
+++ b/tests/auto/widgets/widgets/qkeysequenceedit/tst_qkeysequenceedit.cpp
@@ -43,6 +43,8 @@
 #include <QtTest/QtTest>
 
 #include <QKeySequenceEdit>
+#include <QLineEdit>
+#include <QString>
 
 Q_DECLARE_METATYPE(Qt::Key)
 Q_DECLARE_METATYPE(Qt::KeyboardModifiers)
@@ -55,6 +57,7 @@ private slots:
     void testSetters();
     void testKeys_data();
     void testKeys();
+    void testLineEditContents();
 };
 
 void tst_QKeySequenceEdit::testSetters()
@@ -100,5 +103,26 @@ void tst_QKeySequenceEdit::testKeys()
     QTRY_COMPARE(spy.count(), 1);
 }
 
+void tst_QKeySequenceEdit::testLineEditContents()
+{
+    QKeySequenceEdit edit;
+    QLineEdit *le = edit.findChild<QLineEdit*>();
+    QVERIFY(le);
+
+    QCOMPARE(le->text(), QString());
+
+    edit.setKeySequence(QKeySequence::New);
+    QCOMPARE(edit.keySequence(), QKeySequence(QKeySequence::New));
+
+    edit.clear();
+    QCOMPARE(le->text(), QString());
+
+    edit.setKeySequence(QKeySequence::New);
+    QVERIFY(le->text() != QString());
+
+    edit.setKeySequence(QKeySequence());
+    QCOMPARE(le->text(), QString());
+}
+
 QTEST_MAIN(tst_QKeySequenceEdit)
 #include "tst_qkeysequenceedit.moc"
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 3000aad9ce..a9f5cb686c 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -4097,6 +4097,9 @@ void tst_QLineEdit::clearButton()
     QTRY_COMPARE(filterModel->rowCount(), 1); // matches 'ab'
     QTest::mouseClick(clearButton, Qt::LeftButton, 0, QRect(QPoint(0, 0), clearButton->size()).center());
     QTRY_COMPARE(filterModel->rowCount(), 3);
+
+    filterLineEdit->setReadOnly(true); // QTBUG-34315
+    QVERIFY(!clearButton->isEnabled());
 }
 
 void tst_QLineEdit::sideWidgets()
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index 5b146cf443..b3e50b8ba8 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -954,9 +954,6 @@ void tst_QMdiSubWindow::mouseDoubleClick()
     QStyleOptionTitleBar options;
     options.initFrom(window);
     int height = window->style()->pixelMetric(QStyle::PM_TitleBarHeight, &options);
-    // ### Remove this after mac style has been fixed
-    if (window->style()->inherits("QMacStyle"))
-        height -= 4;
     // has border
     if (!window->style()->styleHint(QStyle::SH_TitleBar_NoBorder, &options, window))
         height += window->isMinimized() ? 8 : 4;
@@ -1692,11 +1689,6 @@ void tst_QMdiSubWindow::fixedMinMaxSize()
     QStyleOptionTitleBar options;
     options.initFrom(subWindow);
     int minimizedHeight = subWindow->style()->pixelMetric(QStyle::PM_TitleBarHeight, &options);
-#if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC)
-    // ### Remove this after mac style has been fixed
-    if (subWindow->style()->inherits("QMacStyle"))
-        minimizedHeight -= 4;
-#endif
     if (!subWindow->style()->styleHint(QStyle::SH_TitleBar_NoBorder, &options, subWindow))
         minimizedHeight += 8;
     int minimizedWidth = subWindow->style()->pixelMetric(QStyle::PM_MDIMinimizedWidth, &options);
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 7c1bb957d6..81ed983d0f 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -50,6 +50,7 @@
 #include <QListWidget>
 #include <QWidgetAction>
 #include <QDesktopWidget>
+#include <QScreen>
 #include <qdialog.h>
 
 #include <qmenu.h>
@@ -59,6 +60,17 @@
 Q_DECLARE_METATYPE(Qt::Key);
 Q_DECLARE_METATYPE(Qt::KeyboardModifiers);
 
+static inline void centerOnScreen(QWidget *w, const QSize &size)
+{
+    const QPoint offset = QPoint(size.width() / 2, size.height() / 2);
+    w->move(QGuiApplication::primaryScreen()->availableGeometry().center() - offset);
+}
+
+static inline void centerOnScreen(QWidget *w)
+{
+    centerOnScreen(w, w->geometry().size());
+}
+
 class tst_QMenu : public QObject
 {
     Q_OBJECT
@@ -257,9 +269,12 @@ void tst_QMenu::addActionsAndClear()
 void tst_QMenu::mouseActivation()
 {
     QWidget topLevel;
+    topLevel.resize(300, 200);
+    centerOnScreen(&topLevel);
     QMenu menu(&topLevel);
     topLevel.show();
     menu.addAction("Menu Action");
+    menu.move(topLevel.geometry().topRight() + QPoint(50, 0));
     menu.show();
     QTest::mouseClick(&menu, Qt::LeftButton, 0, menu.rect().center(), 300);
     QVERIFY(!menu.isVisible());
@@ -275,8 +290,10 @@ void tst_QMenu::mouseActivation()
     QMenu submenu("Menu");
     submenu.addAction("action");
     QAction *action = menubar.addMenu(&submenu);
+    menubar.move(topLevel.geometry().topRight() + QPoint(300, 0));
     menubar.show();
 
+
     QTest::mouseClick(&menubar, Qt::LeftButton, 0, menubar.actionGeometry(action).center(), 300);
     QVERIFY(submenu.isVisible());
     QTest::mouseClick(&submenu, Qt::LeftButton, 0, QPoint(5, 5), 300);
@@ -378,13 +395,16 @@ void tst_QMenu::focus()
 #endif
 
     QWidget window;
+    window.resize(300, 200);
     QPushButton button("Push me", &window);
+    centerOnScreen(&window);
     window.show();
     qApp->setActiveWindow(&window);
 
     QVERIFY(button.hasFocus());
     QCOMPARE(QApplication::focusWidget(), (QWidget *)&button);
     QCOMPARE(QApplication::activeWindow(), &window);
+    menu.move(window.geometry().topRight() + QPoint(50, 0));
     menu.show();
     QVERIFY(button.hasFocus());
     QCOMPARE(QApplication::focusWidget(), (QWidget *)&button);
@@ -399,6 +419,8 @@ void tst_QMenu::overrideMenuAction()
 {
     //test the override menu action by first creating an action to which we set its menu
     QMainWindow w;
+    w.resize(300, 200);
+    centerOnScreen(&w);
 
     QAction *aFileMenu = new QAction("&File", &w);
     w.menuBar()->addAction(aFileMenu);
@@ -442,6 +464,8 @@ void tst_QMenu::statusTip()
 {
     //check that the statustip of actions inserted into the menu are displayed
     QMainWindow w;
+    w.resize(300, 200);
+    centerOnScreen(&w);
     connect(w.statusBar(), SIGNAL(messageChanged(QString)), SLOT(onStatusMessageChanged(QString)));; //creates the status bar
     QToolBar tb;
     QAction a("main action", &tb);
@@ -540,10 +564,12 @@ void tst_QMenu::tearOff()
     menu->addAction("bbb");
     QVERIFY(menu->isTearOffEnabled());
 
+    widget.resize(300, 200);
+    centerOnScreen(&widget);
     widget.show();
     widget.activateWindow();
     QVERIFY(QTest::qWaitForWindowActive(&widget));
-    menu->popup(QPoint(0,0));
+    menu->popup(widget.geometry().topRight() + QPoint(50, 0));
     QVERIFY(QTest::qWaitForWindowActive(menu));
     QVERIFY(!menu->isTearOffMenuVisible());
 
@@ -568,14 +594,18 @@ void tst_QMenu::layoutDirection()
 {
     QMainWindow win;
     win.setLayoutDirection(Qt::RightToLeft);
+    win.resize(300, 200);
+    centerOnScreen(&win);
 
     QMenu menu(&win);
+    menu.move(win.geometry().topRight() + QPoint(50, 0));
     menu.show();
     QVERIFY(QTest::qWaitForWindowExposed(&menu));
     QCOMPARE(menu.layoutDirection(), Qt::RightToLeft);
     menu.close();
 
     menu.setParent(0);
+    menu.move(win.geometry().topRight() + QPoint(50, 0));
     menu.show();
     QVERIFY(QTest::qWaitForWindowExposed(&menu));
     QCOMPARE(menu.layoutDirection(), QApplication::layoutDirection());
@@ -702,6 +732,7 @@ void tst_QMenu::task256918_setFont()
     QFont f;
     f.setPointSize(30);
     action->setFont(f);
+    centerOnScreen(&menu, QSize(120, 40));
     menu.show(); //ensures that the actiongeometry are calculated
     QVERIFY(menu.actionGeometry(action).height() > f.pointSize());
 }
@@ -830,6 +861,13 @@ void PopulateOnAboutToShowTestMenu::populateMenu()
     addSeparator();
 }
 
+static inline QByteArray msgGeometryIntersects(const QRect &r1, const QRect &r2)
+{
+    QString result;
+    QDebug(&result) << r1 << "intersects" << r2;
+    return result.toLocal8Bit();
+}
+
 void tst_QMenu::pushButtonPopulateOnAboutToShow()
 {
     QPushButton b("Test PushButton");
@@ -842,7 +880,7 @@ void tst_QMenu::pushButtonPopulateOnAboutToShow()
     const QRect screen = QApplication::desktop()->screenGeometry(scrNumber);
 
     QRect desiredGeometry = b.geometry();
-    desiredGeometry.moveTopLeft(QPoint(10, screen.bottom()-b.height()-5));
+    desiredGeometry.moveTopLeft(QPoint(screen.x() + 10, screen.bottom() - b.height() - 5));
 
     b.setGeometry(desiredGeometry);
     QVERIFY(QTest::qWaitForWindowExposed(&b));
@@ -859,13 +897,13 @@ void tst_QMenu::pushButtonPopulateOnAboutToShow()
 
     QTimer::singleShot(300, buttonMenu, SLOT(hide()));
     QTest::mouseClick(&b, Qt::LeftButton, Qt::NoModifier, b.rect().center());
-    QVERIFY(!buttonMenu->geometry().intersects(b.geometry()));
+    QVERIFY2(!buttonMenu->geometry().intersects(b.geometry()), msgGeometryIntersects(buttonMenu->geometry(), b.geometry()));
 
     // note: we're assuming that, if we previously got the desired geometry, we'll get it here too
     b.move(10, screen.bottom()-buttonMenu->height()-5);
     QTimer::singleShot(300, buttonMenu, SLOT(hide()));
     QTest::mouseClick(&b, Qt::LeftButton, Qt::NoModifier, b.rect().center());
-    QVERIFY(!buttonMenu->geometry().intersects(b.geometry()));
+    QVERIFY2(!buttonMenu->geometry().intersects(b.geometry()), msgGeometryIntersects(buttonMenu->geometry(), b.geometry()));
 }
 
 void tst_QMenu::QTBUG7907_submenus_autoselect()
@@ -878,6 +916,7 @@ void tst_QMenu::QTBUG7907_submenus_autoselect()
     set1.addMenu(&subset);
     menu.addMenu(&set1);
     menu.addMenu(&set2);
+    centerOnScreen(&menu, QSize(120, 100));
     menu.show();
     QVERIFY(QTest::qWaitForWindowExposed(&menu));
     QTest::mouseClick(&menu, Qt::LeftButton, Qt::NoModifier, QPoint(5,5) );
@@ -893,6 +932,7 @@ void tst_QMenu::QTBUG7411_submenus_activate()
     sub1.addAction("foo");
     sub1.setTitle("&sub1");
     QAction *act1 = menu.addMenu(&sub1);
+    centerOnScreen(&menu, QSize(120, 100));
     menu.show();
     QVERIFY(QTest::qWaitForWindowExposed(&menu));
     menu.setActiveAction(act);
@@ -911,12 +951,12 @@ void tst_QMenu::QTBUG30595_rtl_submenu()
     sub.addAction("bar");
     sub.setTitle("&sub");
     menu.addMenu(&sub);
-    menu.move(200, 20);
+    centerOnScreen(&menu, QSize(120, 40));
     menu.show();
     QVERIFY(QTest::qWaitForWindowExposed(&menu));
     QTest::mouseClick(&menu, Qt::LeftButton, Qt::NoModifier, QPoint(5,5) );
     QTRY_VERIFY(sub.isVisible());
-    QVERIFY(sub.pos().x() < menu.pos().x());
+    QVERIFY2(sub.pos().x() < menu.pos().x(), QByteArray::number(sub.pos().x()) + QByteArrayLiteral(" not less than ") + QByteArray::number(menu.pos().x()));
 }
 
 void tst_QMenu::QTBUG20403_nested_popup_on_shortcut_trigger()
@@ -927,6 +967,7 @@ void tst_QMenu::QTBUG20403_nested_popup_on_shortcut_trigger()
     subsub1.addAction("foo");
     sub1.addMenu(&subsub1);
     menu.addMenu(&sub1);
+    centerOnScreen(&menu, QSize(120, 100));
     menu.show();
     QVERIFY(QTest::qWaitForWindowExposed(&menu));
     QTest::keyPress(&menu, Qt::Key_S);