Merge "Merge remote-tracking branch 'origin/5.12' into dev" into refs/staging/dev

src/widgets/kernel/qapplication.cpp

@@ -3388,6 +3388,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
                                 tablet->tangentialPressure(), tablet->rotation(), tablet->z(),
                                 tablet->modifiers(), tablet->uniqueId(), tablet->button(), tablet->buttons());
                 te.spont = e->spontaneous();
+                te.setAccepted(false);
                 res = d->notify_helper(w, w == receiver ? tablet : &te);
                 eventAccepted = ((w == receiver) ? tablet : &te)->isAccepted();
                 e->spont = false;

src/widgets/kernel/qwidgetwindow.cpp

@@ -1044,6 +1044,7 @@ void QWidgetWindow::handleTabletEvent(QTabletEvent *event)
                         event->pressure(), event->xTilt(), event->yTilt(), event->tangentialPressure(),
                         event->rotation(), event->z(), event->modifiers(), event->uniqueId(), event->button(), event->buttons());
         ev.setTimestamp(event->timestamp());
+        ev.setAccepted(false);
         QGuiApplication::forwardEvent(widget, &ev, event);
         event->setAccepted(ev.isAccepted());
     }

tests/auto/corelib/animation/qparallelanimationgroup/BLACKLIST

@@ -1,2 +1,3 @@
 [deleteChildrenWithRunningGroup]
 osx-10.12
+osx-10.13

tests/auto/corelib/tools/qtimeline/BLACKLIST

@@ -6,3 +6,4 @@ osx-10.13
 windows
 [frameRate]
 osx-10.12
+osx-10.13

tests/auto/gui/kernel/qguiapplication/BLACKLIST

@@ -0,0 +1,4 @@
+[focusObject]
+opensuse
+opensuse-leap
+ubuntu

tests/auto/widgets/dialogs/qcolordialog/qcolordialog.pro

@@ -2,5 +2,3 @@ CONFIG += testcase
 TARGET = tst_qcolordialog
 QT += widgets testlib
 SOURCES  += tst_qcolordialog.cpp
-
-linux*: CONFIG += insignificant_test # Crashes on different Linux distros

tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp

@@ -84,6 +84,9 @@ void tst_QColorDialog::testNativeActiveModalWidget()
     // Check that QApplication::activeModalWidget retruns the
     // color dialog when it is executing, even when using a native
     // dialog:
+#if defined(Q_OS_LINUX)
+    QSKIP("This test crashes sometimes. Although rarely, but it happens. See QTBUG-50842.");
+#endif
     TestNativeDialog d;
     QTimer::singleShot(1000, &d, SLOT(hide()));
     d.exec();
@@ -121,6 +124,9 @@ void tst_QColorDialog::testGetRgba()
 
 void tst_QColorDialog::defaultOkButton()
 {
+#if defined(Q_OS_LINUX)
+    QSKIP("This test crashes sometimes. Although rarely, but it happens. See QTBUG-50842.");
+#endif
     QTimer::singleShot(4000, qApp, SLOT(quit()));
     QTimer::singleShot(0, this, SLOT(testGetRgba()));
     qApp->exec();

tests/auto/widgets/effects/qgraphicseffect/BLACKLIST

@@ -0,0 +1,3 @@
+[prepareGeometryChangeInvalidateCache]
+opensuse
+opensuse-leap

tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST

@@ -3,3 +3,15 @@
 osx-10.11 ci
 [isActive]
 opensuse-42.3 ci
+[removeFullyTransparentItem]
+osx-10.11
+osx-10.12
+[tabFocus_sceneWithNestedFocusWidgets]
+opensuse
+opensuse-leap
+[inputMethod]
+opensuse
+opensuse-leap
+[hoverEvents_parentChild]
+ubuntu
+

tests/auto/widgets/itemviews/qheaderview/BLACKLIST

@@ -0,0 +1,3 @@
+[stretchAndRestoreLastSection]
+opensuse
+opensuse-leap