summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativemousearea
Commit message (Collapse)AuthorAgeFilesLines
* Specify global mouse position for QDeclarativeMouseArea auto testJonathan Liu2012-02-281-3/+4
| | | | | | | | | | The preventContextMenu QDeclarativeMouseArea auto test creates QContextMenuEvent without specifying the global mouse position. As a result, the event's global mouse position is incorrectly set to QCursor::pos(). Change-Id: Ib67fbcf3acf968eb2748426ad0db0e900826b232 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fixed QtDeclarative autotest deployment for WinCE devices.jaanttil2012-02-061-1/+2
| | | | | | Change-Id: Id42aefd69484d5cfe1f44566dffce4b05db5aa19 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-182-0/+85
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-132-0/+85
| |\
| | * QDeclarativeMouseArea: block context menu eventsCaio Marcelo de Oliveira Filho2011-05-132-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the MouseArea accepts the same button used to trigger a context menu event, it should not let the event to be delivered to item behind. This is important for items that do implement contextMenuEvent(), like QDeclarativeWebView. When there's a mouse area on top of this item and that accepts the right click (in Linux), the event was still being delivered and the WebView menu was incorrectly appearing. QtWebKit bug https://bugs.webkit.org/show_bug.cgi?id=56526 documents this problem. Change-Id: I386fac6c96f47b8616e2eeb7e5f97043ba418980 Merge-request: 1185 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
|/ / | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-232-0/+149
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * Prevent recursion due to nested Flickables with pressDelayMartin Jones2011-02-211-15/+5
| | | | | | | | | | | | | | | | | | The outermost Flickable handles pressDelay for all descendents, rather than having it cascade up and replayed multiple times. Change-Id: Id294862469f3ce56b0940fbbb0e041d4c9f64f28 Task-number: QTBUG-17361 Reviewed-by: Michael Brasser
| * Allow MouseArea to prevent mouse grab begin stolen by Flickable.Martin Jones2011-02-172-0/+159
| | | | | | | | | | | | | | | | | | | | | | | | Placing a MouseArea in a Flickable (or PinchArea, or PathView) allows the Flickable to steal mouse events when it detects a flick/drag event. In some cases this is not desireable and MouseArea should be able to retain its grab. Added a 'preventStealing' property to prevent an ancestor item from stealing the MouseArea's grab. Change-Id: I6277fbb76919b2b35d4e32a247b38a90e305dbdf Task-number: QTBUG-17285 Reviewed-by: Joona Petrell
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-042-0/+63
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/samegame/SamegameCore/samegame.js mkspecs/features/symbian/default_post.prf src/declarative/qml/qdeclarativeengine.cpp src/gui/text/qtextdocumentlayout.cpp src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/s60installs.pro tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp tests/auto/declarative/qmlvisual/qmlvisual.pro
| * Notify that pressed has changed before calling the onClicked handler.Michael Brasser2011-01-252-0/+63
| | | | | | | | | | | | | | This is a more natural ordering, and makes it trivial to control different state groups with pressed and onClicked. Reviewed-by: Martin Jones
* | Merge remote branch 'origin/master' into file-engine-refactorJoão Abecasis2010-12-021-0/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master's version of conflicting def files picked. Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-0/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| | * Flickable and MouseArea were too eager to take/keep mouse grab.Martin Jones2010-11-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | This meant that they would sometimes act upon a drag immediately, rather than waiting for a nested area to take the grab. This resulted in a short jump before future events were handled by the nested item. Task-number: QTBUG-15568 Reviewed-by: Bea Lam
* | | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-234-1/+66
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-012-0/+58
| |\ \ | | |/
| | * Quickly clicking an item that doesn't use double clicking should result in ↵Joona Petrell2010-11-012-0/+58
| | | | | | | | | | | | | | | | | | | | | two separate clicks Task-number: QTBUG-14832 Reviewed-by: Martin Jones
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-152-0/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp tests/auto/declarative/qdeclarativetext/data/alignments_cb.png tests/auto/declarative/qdeclarativetext/data/alignments_cc.png tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
| | * Add test for QTBUG-14279Martin Jones2010-10-082-0/+7
| | | | | | | | | | | | Task-number: QTBUG-14279
| * | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-081-1/+1
| |/ | | | | | | | | | | | | | | | | | | Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
* | Fix deployment for examples and testsShane Kearns2010-10-121-1/+1
|/ | | | | | | | | | | Due to the change from default deployment in symbian from being hardcoded in qmake to being in default_deployment.prf the .pro files needed to be changed. Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise the default deployment lines are not added and the test won't install. Reviewed-By: Miikka Heikkinen
* Improve test coverage for declarative module.Michael Brasser2010-10-041-0/+1
| | | | Add additional autotests, and remove unreachable functions.
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-298-8/+8
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* When onDoubleClicked: is handled don't emit a second onPressed/onClickedMartin Jones2010-09-132-0/+46
| | | | | Task-number: QTBUG-12250 Reviewed-by: Michael Brasser
* Allow MouseArea dragging to filter mouse events from descendantsMartin Jones2010-07-221-0/+11
| | | | | | | | This allows dragging a MouseArea that contains a clickable MouseArea, for example. Task-number: QTBUG-12323 Reviewed-by: Michael Brasser
* Make declarative autotests compile on Symbian abld build systemJoona Petrell2010-06-082-3/+6
| | | | | Task-number: Reviewed-by: Martin Jones
* Symbian build fix to declarative auto and benchmark testsJoona Petrell2010-05-141-1/+8
| | | | | Task-number: QTBUG-9491 Reviewed-by: Martin Jones
* Remove debug messages from mousearea autotest fileLeonardo Sobral Cunha2010-05-101-6/+6
|
* Add missing qml file to qdeclarativemouseareaLeonardo Sobral Cunha2010-05-071-0/+28
|
* Fix autotest bug in MouseAreaLeonardo Sobral Cunha2010-05-071-1/+1
| | | | Reviewed-by: Martin Jones
* Avoid emitting release when the mouse is ungrabbedLeonardo Sobral Cunha2010-05-071-0/+44
| | | | | | | | | | Added an onCanceled signal to mouse area, which is triggered when the mouse area rejects the event (propagates to the nearest mouse area beneath) or some other element steals the mouse grab (flickable, for example). Task-number: QTBUG-10162 Reviewed-by: Michael Brasser
* Fix versioning of Qt Declarative's in-built typesAlan Alpert2010-04-215-5/+5
| | | | | | Since we aren't releasing for 4.6, all types are new in 4.7. Task-number: QTBUG-10081
* Add drag.active property to MouseArea in qmlLeonardo Sobral Cunha2010-04-202-0/+84
| | | | | | | The drag.active property specifies if the target item is being dragged. Task-number: QTBUG-9833 Reviewed-by: Martin Jones
* Renamed mousePosChanged signal to mousePositionChangedLeonardo Sobral Cunha2010-04-191-1/+1
|
* Update mouse area coordinates automatically when changing positionLeonardo Sobral Cunha2010-04-192-0/+79
| | | | | | | | | Mouse area coordinates are now updated when the mouse area changes position and positionChanged signals are not emitted on mousePress anymore (only mousePosChanged signals). Task-number: QTBUG-9716 Reviewed-by: Michael Brasser
* Tweak tests to run in parallelAaron Kennedy2010-04-131-0/+3
|
* Don't emit clicked() after pressAndHold()Martin Jones2010-04-082-0/+44
| | | | Task-number: QTBUG-9676
* Allow MouseArea.Drag.target to be reset.Martin Jones2010-04-072-6/+67
| | | | Task-number: QTBUG-9637
* Update mouseX(Y) when clicking on a mouse areaLeonardo Sobral Cunha2010-03-312-0/+56
| | | | | | | | This fixes the original commit, 56aa9370dbafa8ee4, for QTBUG-9383. We need to emit a positionChanged signal to update the mouseX(Y) for the mouse area. Reviewed-by: Martin Jones
* Change autotest class prefix from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX ↵Leonardo Sobral Cunha2010-02-241-4/+4
| | | | to QDeclarativeXXX.
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-243-0/+175
QDeclarativeXXX.