diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-25 18:28:32 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-25 18:35:38 +0100 |
| commit | 9a272ad1854d744ea57296ba633b9d0dc19d1625 (patch) | |
| tree | 096752ec339e18998517a4598f907e4b42b9403d /examples/quick | |
| parent | 70c6b9639c53d2a530ccabd1395f561211c16fa4 (diff) | |
| parent | d8a052bc6b0349045db3d43a373b09cb16b41a48 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tools/qmlimportscanner/main.cpp
Change-Id: I01e17581f6691a03f83788773364d0cf96319514
Diffstat (limited to 'examples/quick')
| -rw-r--r-- | examples/quick/demos/calqlatr/calqlatr.qml | 5 | ||||
| -rw-r--r-- | examples/quick/localstorage/doc/src/localstorage.qdoc | 2 | ||||
| -rw-r--r-- | examples/quick/localstorage/localstorage/qml-localstorage-example.png | bin | 46168 -> 0 bytes |
3 files changed, 4 insertions, 3 deletions
diff --git a/examples/quick/demos/calqlatr/calqlatr.qml b/examples/quick/demos/calqlatr/calqlatr.qml index 81f95907a6..017d819b01 100644 --- a/examples/quick/demos/calqlatr/calqlatr.qml +++ b/examples/quick/demos/calqlatr/calqlatr.qml @@ -128,6 +128,7 @@ Rectangle { height: parent.height MouseArea { + id: mouseInput property real startX: 0 property real oldP: 0 property bool rewind: false @@ -140,7 +141,7 @@ Rectangle { height: 50 onPositionChanged: { var reverse = startX > window.width / 2 - var mx = mapToItem(window, mouse.x).x + var mx = mapToItem(window, mouseInput.mouseX, mouseInput.mouseY).x var p = Math.abs((mx - startX) / (window.width - display.width)) if (p < oldP) rewind = reverse ? false : true @@ -149,7 +150,7 @@ Rectangle { controller.progress = reverse ? 1 - p : p oldP = p } - onPressed: startX = mapToItem(window, mouse.x).x + onPressed: startX = mapToItem(window, mouseInput.mouseX, mouseInput.mouseY).x onReleased: { if (rewind) controller.completeToBeginning() diff --git a/examples/quick/localstorage/doc/src/localstorage.qdoc b/examples/quick/localstorage/doc/src/localstorage.qdoc index 1bfba147e1..8ffcbe9d14 100644 --- a/examples/quick/localstorage/doc/src/localstorage.qdoc +++ b/examples/quick/localstorage/doc/src/localstorage.qdoc @@ -28,7 +28,7 @@ \title Qt Quick Examples - Local Storage \example localstorage \brief A collection of QML local storage examples. - \image qml-localstorage-example.png + \borderedimage qml-localstorage-example.png \e{Local Storage} is a collection of small QML examples relating to Qt Quick's \l{local storage} functionality. diff --git a/examples/quick/localstorage/localstorage/qml-localstorage-example.png b/examples/quick/localstorage/localstorage/qml-localstorage-example.png Binary files differdeleted file mode 100644 index 7d7edafe63..0000000000 --- a/examples/quick/localstorage/localstorage/qml-localstorage-example.png +++ /dev/null |
