diff options
Diffstat (limited to 'tests/auto')
5 files changed, 113 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.errors.txt b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.errors.txt index 810fd31b41..d76f18ba89 100644 --- a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.errors.txt +++ b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.1.errors.txt @@ -1 +1 @@ -5:5:Invalid grouped property access +5:5:Invalid grouped property access: Property "o" with type "QVariant", which is not a value type diff --git a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.3.errors.txt b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.3.errors.txt index f6d6f29fbf..9a0422753f 100644 --- a/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.3.errors.txt +++ b/tests/auto/qml/qqmllanguage/data/invalidGroupedProperty.3.errors.txt @@ -1 +1 @@ -4:5:Invalid grouped property access +4:5:Invalid grouped property access: Property "customType" with type "MyCustomVariantType", which is not a value type diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/data/draghandler_and_pinchhandler.qml b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/draghandler_and_pinchhandler.qml new file mode 100644 index 0000000000..08b85aef50 --- /dev/null +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/data/draghandler_and_pinchhandler.qml @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the manual tests of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.12 + +Item { + id: root + objectName: "DragHandler_and_PinchHandler" + width: 640 + height: 480 + + Rectangle { + id: rect + objectName: "Rect" + color: dragHandler.active ? "blue" : (pinchHandler.active ? "magenta" : "grey") + width: 200; height: 200; x: 100; y: 100 + + PinchHandler { + id: pinchHandler + objectName: "PinchHandler" + } + DragHandler { + id: dragHandler + objectName: "DragHandler" + } + + Text { + color: "white" + anchors.centerIn: parent + horizontalAlignment: Text.AlignHCenter + text: rect.objectName + "\n" + + "rotation:" + rect.rotation + "\n" + + dragHandler.centroid.position.x.toFixed(1) + "," + dragHandler.centroid.position.y.toFixed(1) + } + } +} diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp index 0c544ef484..eb210c2112 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp @@ -60,6 +60,7 @@ private slots: void touchDragMultiSliders(); void touchPassiveGrabbers_data(); void touchPassiveGrabbers(); + void touchPinchAndMouseMove(); private: void createView(QScopedPointer<QQuickView> &window, const char *fileName); @@ -521,6 +522,51 @@ void tst_DragHandler::touchPassiveGrabbers() QQuickTouchUtils::flush(window); } +void tst_DragHandler::touchPinchAndMouseMove() +{ + QScopedPointer<QQuickView> windowPtr; + createView(windowPtr, "draghandler_and_pinchhandler.qml"); + QQuickView *window = windowPtr.data(); + QQuickItem *rect = window->rootObject()->findChild<QQuickItem*>(QLatin1String("Rect")); + QQuickPointerHandler *pinchHandler = window->rootObject()->findChild<QQuickPointerHandler*>(QLatin1String("PinchHandler")); + + QPoint p1(150,200); + QPoint p2(250,200); + + // Trigger a scale pinch, PinchHandler should activate + QTest::QTouchEventSequence touch = QTest::touchEvent(window, touchDevice); + touch.press(1, p1).press(2, p2).commit(); + QQuickTouchUtils::flush(window); + QPoint delta(10,0); + for (int i = 0; i < 10 && !pinchHandler->active(); ++i) { + p1-=delta; + p2+=delta; + touch.move(1, p1).move(2, p2).commit(); + QQuickTouchUtils::flush(window); + } + QCOMPARE(pinchHandler->active(), true); + + // While having the touch points pressed, send wrong mouse event as MS Windows did: + // * A MoveMove with LeftButton down + // (in order to synthesize that, qtestMouseButtons needs to be modified) + // (This will make the DragHandler do a passive grab) + QTestPrivate::qtestMouseButtons = Qt::LeftButton; + QTest::mouseMove(window, p1 + delta); + + touch.release(1, p1).release(2, p2).commit(); + QQuickTouchUtils::flush(window); + + // Now move the mouse with no buttons down and check if the rect did not move + // At this point, no touch points are pressed and no mouse buttons are pressed. + QTestPrivate::qtestMouseButtons = Qt::NoButton; + QSignalSpy rectMovedSpy(rect, SIGNAL(xChanged())); + for (int i = 0; i < 10; ++i) { + p1 += delta; + QTest::mouseMove(window, p1); + QCOMPARE(rectMovedSpy.count(), 0); + } +} + QTEST_MAIN(tst_DragHandler) #include "tst_qquickdraghandler.moc" diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index ab101dc1be..a862604fc1 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -2350,8 +2350,10 @@ void tst_qquickwindow::defaultSurfaceFormat() // Depth and stencil should be >= what has been requested. For real. But use // the context since the window's surface format is only partially updated // on most platforms. - QVERIFY(window.openglContext()->format().depthBufferSize() >= 16); - QVERIFY(window.openglContext()->format().stencilBufferSize() >= 8); + const QOpenGLContext *openglContext = nullptr; + QTRY_VERIFY((openglContext = window.openglContext()) != nullptr); + QVERIFY(openglContext->format().depthBufferSize() >= 16); + QVERIFY(openglContext->format().stencilBufferSize() >= 8); #endif QSurfaceFormat::setDefaultFormat(savedDefaultFormat); } |