diff options
Diffstat (limited to 'tests/auto/other')
-rw-r--r-- | tests/auto/other/macgui/guitest.cpp | 4 | ||||
-rw-r--r-- | tests/auto/other/networkselftest/BLACKLIST | 4 | ||||
-rw-r--r-- | tests/auto/other/networkselftest/networkselftest.pro | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/other/macgui/guitest.cpp b/tests/auto/other/macgui/guitest.cpp index 1ddd0ca870..dee7ace1b9 100644 --- a/tests/auto/other/macgui/guitest.cpp +++ b/tests/auto/other/macgui/guitest.cpp @@ -145,7 +145,9 @@ namespace NativeEvents { CGEventType mouseDownType = (buttons & Qt::LeftButton) ? kCGEventLeftMouseDown : (buttons & Qt::RightButton) ? kCGEventRightMouseDown : kCGEventOtherMouseDown; - CGMouseButton mouseButton = mouseDownType == kCGEventOtherMouseDown ? kCGMouseButtonCenter : kCGEventLeftMouseDown; + // The mouseButton argument to CGEventCreateMouseEvent() is ignored unless the type + // is kCGEventOtherMouseDown, so defaulting to kCGMouseButtonLeft is fine. + CGMouseButton mouseButton = mouseDownType == kCGEventOtherMouseDown ? kCGMouseButtonCenter : kCGMouseButtonLeft; CGEventRef mouseEvent = CGEventCreateMouseEvent(NULL, mouseDownType, position, mouseButton); CGEventPost(kCGHIDEventTap, mouseEvent); diff --git a/tests/auto/other/networkselftest/BLACKLIST b/tests/auto/other/networkselftest/BLACKLIST new file mode 100644 index 0000000000..4a958b43a5 --- /dev/null +++ b/tests/auto/other/networkselftest/BLACKLIST @@ -0,0 +1,4 @@ +# QTBUG-27571 +[ftpProxyServer] +windows 32bit +windows 64bit diff --git a/tests/auto/other/networkselftest/networkselftest.pro b/tests/auto/other/networkselftest/networkselftest.pro index c387ca2e84..7c307a097b 100644 --- a/tests/auto/other/networkselftest/networkselftest.pro +++ b/tests/auto/other/networkselftest/networkselftest.pro @@ -3,5 +3,3 @@ TARGET = tst_networkselftest SOURCES += tst_networkselftest.cpp QT = core core-private network testlib - -win32:CONFIG += insignificant_test # QTBUG-27571 |