From 01dc7e2ea476e0e6dcdce2e72979bbc858f4057d Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Tue, 31 Jan 2012 16:52:36 +1000 Subject: Remove QtQuick1 elements from qtdeclarative QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones --- .../qdeclarativemousearea/data/clickandhold.qml | 13 -------- .../qdeclarativemousearea/data/clicktwice.qml | 16 --------- .../qdeclarativemousearea/data/doubleclick.qml | 16 --------- .../qdeclarativemousearea/data/dragging.qml | 28 ---------------- .../qdeclarativemousearea/data/dragproperties.qml | 28 ---------------- .../qdeclarativemousearea/data/dragreset.qml | 28 ---------------- .../qdeclarativemousearea/data/pressedOrdering.qml | 28 ---------------- .../data/preventContextMenu.qml | 22 ------------- .../qdeclarativemousearea/data/preventstealing.qml | 24 -------------- .../qdeclarativemousearea/data/rejectEvent.qml | 28 ---------------- .../data/updateMousePosOnClick.qml | 20 ------------ .../data/updateMousePosOnResize.qml | 38 ---------------------- 12 files changed, 289 deletions(-) delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/clickandhold.qml delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/clicktwice.qml delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/doubleclick.qml delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/dragging.qml delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/dragproperties.qml delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/dragreset.qml delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/pressedOrdering.qml delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/preventContextMenu.qml delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/preventstealing.qml delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/rejectEvent.qml delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/updateMousePosOnClick.qml delete mode 100644 tests/auto/qtquick1/qdeclarativemousearea/data/updateMousePosOnResize.qml (limited to 'tests/auto/qtquick1/qdeclarativemousearea/data') diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/clickandhold.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/clickandhold.qml deleted file mode 100644 index a6409e2e31..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/clickandhold.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 1.0 - -Item { - id: root - property bool clicked: false - property bool held: false - - MouseArea { - width: 200; height: 200 - onClicked: { root.clicked = true } - onPressAndHold: { root.held = true } - } -} diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/clicktwice.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/clicktwice.qml deleted file mode 100644 index c6b1f8992a..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/clicktwice.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 1.0 - -Item { - id: root - property int clicked: 0 - property int pressed: 0 - property int released: 0 - - MouseArea { - width: 200; height: 200 - onPressed: { root.pressed++ } - onClicked: { root.clicked++ } - onReleased: { root.released++ } - } -} - diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/doubleclick.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/doubleclick.qml deleted file mode 100644 index 55b0812e48..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/doubleclick.qml +++ /dev/null @@ -1,16 +0,0 @@ -import QtQuick 1.0 - -Item { - id: root - property int clicked: 0 - property int doubleClicked: 0 - property int released: 0 - - MouseArea { - width: 200; height: 200 - onClicked: { root.clicked++ } - onDoubleClicked: { root.doubleClicked++ } - onReleased: { root.released++ } - } -} - diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/dragging.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/dragging.qml deleted file mode 100644 index dd89efb5ab..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/dragging.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 1.0 -Rectangle { - id: whiteRect - width: 200 - height: 200 - color: "white" - Rectangle { - id: blackRect - objectName: "blackrect" - color: "black" - y: 50 - x: 50 - width: 100 - height: 100 - opacity: (whiteRect.width-blackRect.x+whiteRect.height-blackRect.y-199)/200 - Text { text: blackRect.opacity} - MouseArea { - objectName: "mouseregion" - anchors.fill: parent - drag.target: blackRect - drag.axis: Drag.XandYAxis - drag.minimumX: 0 - drag.maximumX: whiteRect.width-blackRect.width - drag.minimumY: 0 - drag.maximumY: whiteRect.height-blackRect.height - } - } - } diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/dragproperties.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/dragproperties.qml deleted file mode 100644 index 7baefd5ded..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/dragproperties.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 1.0 -Rectangle { - id: whiteRect - width: 200 - height: 200 - color: "white" - Rectangle { - id: blackRect - objectName: "blackrect" - color: "black" - y: 50 - x: 50 - width: 100 - height: 100 - opacity: (whiteRect.width-blackRect.x+whiteRect.height-blackRect.y-199)/200 - Text { text: blackRect.opacity} - MouseArea { - objectName: "mouseregion" - anchors.fill: parent - drag.target: blackRect - drag.axis: Drag.XandYAxis - drag.minimumX: 0 - drag.maximumX: whiteRect.width-blackRect.width - drag.minimumY: 0 - drag.maximumY: whiteRect.height-blackRect.height - } - } - } diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/dragreset.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/dragreset.qml deleted file mode 100644 index c6d2e204b2..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/dragreset.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 1.0 -Rectangle { - id: whiteRect - width: 200 - height: 200 - color: "white" - Rectangle { - id: blackRect - objectName: "blackrect" - color: "black" - y: 50 - x: 50 - width: 100 - height: 100 - opacity: (whiteRect.width-blackRect.x+whiteRect.height-blackRect.y-199)/200 - Text { text: blackRect.opacity} - MouseArea { - objectName: "mouseregion" - anchors.fill: parent - drag.target: haveTarget ? blackRect : undefined - drag.axis: Drag.XandYAxis - drag.minimumX: 0 - drag.maximumX: whiteRect.width-blackRect.width - drag.minimumY: 0 - drag.maximumY: whiteRect.height-blackRect.height - } - } - } diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/pressedOrdering.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/pressedOrdering.qml deleted file mode 100644 index 4a80e83465..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/pressedOrdering.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 1.0 - -Item { - id: root - property string value: "base" - - MouseArea { - id: mouseArea - width: 200; height: 200 - onClicked: toggleState.state = "toggled" - } - - StateGroup { - states: State { - name: "pressed" - when: mouseArea.pressed - PropertyChanges { target: root; value: "pressed" } - } - } - - StateGroup { - id: toggleState - states: State { - name: "toggled" - PropertyChanges { target: root; value: "toggled" } - } - } -} diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/preventContextMenu.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/preventContextMenu.qml deleted file mode 100644 index dcbb5d766e..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/preventContextMenu.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 1.1 -import Test 1.0 - -Item { - width: 200 - height: 200 - - property alias mouseAreaEnabled: mouseArea.enabled - property alias eventsReceived: receiver.eventCount - - ContextMenuEventReceiver { - id: receiver - anchors.fill: parent - } - - MouseArea { - id: mouseArea - anchors.fill: parent - acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton - enabled: true - } -} diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/preventstealing.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/preventstealing.qml deleted file mode 100644 index 11553fadaf..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/preventstealing.qml +++ /dev/null @@ -1,24 +0,0 @@ -import QtQuick 1.1 - -Flickable { - property bool stealing: true - width: 200 - height: 200 - contentWidth: 400 - contentHeight: 400 - Rectangle { - color: "black" - width: 400 - height: 400 - Rectangle { - x: 50; y: 50 - width: 100; height: 100 - color: "steelblue" - MouseArea { - objectName: "mousearea" - anchors.fill: parent - preventStealing: stealing - } - } - } -} diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/rejectEvent.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/rejectEvent.qml deleted file mode 100644 index fc8292d703..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/rejectEvent.qml +++ /dev/null @@ -1,28 +0,0 @@ -import QtQuick 1.0 - -Rectangle { - id: root - color: "#ffffff" - width: 320; height: 240 - property bool mr1_pressed: false - property bool mr1_released: false - property bool mr1_canceled: false - property bool mr2_pressed: false - property bool mr2_released: false - property bool mr2_canceled: false - - MouseArea { - id: mouseRegion1 - anchors.fill: parent - onPressed: { root.mr1_pressed = true } - onReleased: { root.mr1_released = true } - onCanceled: { root.mr1_canceled = true } - } - MouseArea { - id: mouseRegion2 - width: 120; height: 120 - onPressed: { root.mr2_pressed = true; mouse.accepted = false } - onReleased: { root.mr2_released = true } - onCanceled: { root.mr2_canceled = true } - } -} diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/updateMousePosOnClick.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/updateMousePosOnClick.qml deleted file mode 100644 index b77f7431c6..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/updateMousePosOnClick.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 1.0 - -Rectangle { - color: "#ffffff" - width: 320; height: 240 - MouseArea { - id: mouseRegion - objectName: "mouseregion" - anchors.fill: parent - Rectangle { - id: ball - objectName: "ball" - width: 20; height: 20 - radius: 10 - color: "#0000ff" - x: { mouseRegion.mouseX } - y: mouseRegion.mouseY - } - } -} diff --git a/tests/auto/qtquick1/qdeclarativemousearea/data/updateMousePosOnResize.qml b/tests/auto/qtquick1/qdeclarativemousearea/data/updateMousePosOnResize.qml deleted file mode 100644 index 6571d8b12d..0000000000 --- a/tests/auto/qtquick1/qdeclarativemousearea/data/updateMousePosOnResize.qml +++ /dev/null @@ -1,38 +0,0 @@ -import QtQuick 1.0 - -Rectangle { - color: "#ffffff" - width: 320; height: 240 - Rectangle { - id: brother - objectName: "brother" - color: "lightgreen" - x: 200; y: 100 - width: 120; height: 120 - } - MouseArea { - id: mouseRegion - objectName: "mouseregion" - - property int x1 - property int y1 - property int x2 - property int y2 - property bool emitPositionChanged: false - property bool mouseMatchesPos: true - - anchors.fill: brother - onPressed: { - if (mouse.x != mouseX || mouse.y != mouseY) - mouseMatchesPos = false - x1 = mouseX; y1 = mouseY - anchors.fill = parent - } - onPositionChanged: { emitPositionChanged = true } - onMousePositionChanged: { - if (mouse.x != mouseX || mouse.y != mouseY) - mouseMatchesPos = false - x2 = mouseX; y2 = mouseY - } - } -} -- cgit v1.2.3