diff options
| -rw-r--r--[-rwxr-xr-x] | src/corelib/io/qfilesystemengine_win.cpp | 0 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 7 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/quiview.mm | 2 | ||||
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 24 | ||||
| -rw-r--r-- | src/widgets/itemviews/qtreeview.cpp | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp | 0 |
6 files changed, 19 insertions, 16 deletions
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index fadc058110..fadc058110 100755..100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index c888551729..61f0012a2d 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -886,6 +886,8 @@ Q_GLOBAL_STATIC(QCocoaTabletDeviceDataHash, tabletDeviceDataHash) - (bool)handleTabletEvent: (NSEvent *)theEvent { + static bool ignoreButtonMapping = qEnvironmentVariableIsSet("QT_MAC_TABLET_IGNORE_BUTTON_MAPPING"); + if (!m_platformWindow) return false; @@ -934,14 +936,15 @@ Q_GLOBAL_STATIC(QCocoaTabletDeviceDataHash, tabletDeviceDataHash) rotation -= 360.0; Qt::KeyboardModifiers keyboardModifiers = [QNSView convertKeyModifiers:[theEvent modifierFlags]]; + Qt::MouseButtons buttons = ignoreButtonMapping ? static_cast<Qt::MouseButtons>(static_cast<uint>([theEvent buttonMask])) : m_buttons; qCDebug(lcQpaTablet, "event on tablet %d with tool %d type %d unique ID %lld pos %6.1f, %6.1f root pos %6.1f, %6.1f buttons 0x%x pressure %4.2lf tilt %d, %d rotation %6.2lf", deviceId, deviceData.device, deviceData.pointerType, deviceData.uid, windowPoint.x(), windowPoint.y(), screenPoint.x(), screenPoint.y(), - static_cast<uint>(m_buttons), pressure, xTilt, yTilt, rotation); + static_cast<uint>(buttons), pressure, xTilt, yTilt, rotation); QWindowSystemInterface::handleTabletEvent(m_platformWindow->window(), timestamp, windowPoint, screenPoint, - deviceData.device, deviceData.pointerType, m_buttons, pressure, xTilt, yTilt, + deviceData.device, deviceData.pointerType, buttons, pressure, xTilt, yTilt, tangentialPressure, rotation, z, deviceData.uid, keyboardModifiers); return true; diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm index 42e57d0f4f..4c2184a1f6 100644 --- a/src/plugins/platforms/ios/quiview.mm +++ b/src/plugins/platforms/ios/quiview.mm @@ -57,6 +57,7 @@ + (void)load { +#ifndef Q_OS_TVOS if (QOperatingSystemVersion::current() < QOperatingSystemVersion(QOperatingSystemVersion::IOS, 11)) { // iOS 11 handles this though [UIView safeAreaInsetsDidChange], but there's no signal for // the corresponding top and bottom layout guides that we use on earlier versions. Note @@ -71,6 +72,7 @@ } ]; } +#endif } + (Class)layerClass diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index b24ce0578e..f430294142 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -141,19 +141,17 @@ static QSet<QByteArray> keywords() #endif #ifdef Q_CC_MSVC << "msvc" - #ifdef _MSC_VER - #if _MSC_VER == 1910 - << "msvc-2017" - #elif _MSC_VER == 1900 - << "msvc-2015" - #elif _MSC_VER == 1800 - << "msvc-2013" - #elif _MSC_VER == 1700 - << "msvc-2012" - #elif _MSC_VER == 1600 +# if _MSC_VER <= 1600 << "msvc-2010" - #endif - #endif +# elif _MSC_VER <= 1700 + << "msvc-2012" +# elif _MSC_VER <= 1800 + << "msvc-2013" +# elif _MSC_VER <= 1900 + << "msvc-2015" +# else + << "msvc-2017" +# endif #endif #ifdef Q_PROCESSOR_X86 @@ -163,7 +161,7 @@ static QSet<QByteArray> keywords() << "arm" #endif -#ifdef Q_AUTOTEST_EXPORT +#ifdef QT_BUILD_INTERNAL << "developer-build" #endif ; diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index e593d82576..569351ff87 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -3514,7 +3514,7 @@ int QTreeViewPrivate::itemAtCoordinate(int coordinate) const const int contentsCoordinate = coordinate + vbar->value(); for (int viewItemIndex = 0; viewItemIndex < viewItems.count(); ++viewItemIndex) { viewItemCoordinate += itemHeight(viewItemIndex); - if (viewItemCoordinate >= contentsCoordinate) + if (viewItemCoordinate > contentsCoordinate) return (viewItemIndex >= itemCount ? -1 : viewItemIndex); } } else { // ScrollPerItem diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp index 02b70c317e..02b70c317e 100755..100644 --- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp |