summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeflickable
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-162-0/+47
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/symbian-gcce/qmake.conf qmake/generators/metamakefile.cpp qmake/generators/win32/mingw_make.cpp src/corelib/global/global.pri src/corelib/global/qglobal.h src/opengl/qgl.cpp src/opengl/qwindowsurface_gl.cpp src/plugins/platforms/wayland/qwaylandbuffer.h tests/auto/qnetworkreply/tst_qnetworkreply.cpp tools/designer/src/components/formeditor/qdesigner_resource.cpp
| * Disabled non-QDeclarativeItems in Flickable break flickingMartin Jones2011-03-162-0/+47
| | | | | | | | | | | | | | | | Allow Flickable to steal grab from items that are disabled. Change-Id: I71e401cd78695ecb2c3d47abde1c3d13e722d848 Task-number: QT-4677 Reviewed-by: Michael Brasser
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-091-2/+2
|\ \ | |/
| * Fix unstable qdeclarativeflickable test.Martin Jones2011-03-081-2/+2
| | | | | | | | Change-Id: I81b02147f88e948e3f3a663de0390893f8349fd9
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-232-0/+62
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * Add missing test file.Martin Jones2011-02-221-0/+33
| | | | | | | | | | | | | | Missed in 1bcddaaf318fc37c71c5191913f3487c49444ec6 Change-Id: I4f71e5fb2b0e67a6e64ee64ae03b9d9cfc7a244f Task-number: QTBUG-17361
| * Prevent recursion due to nested Flickables with pressDelayMartin Jones2011-02-211-0/+29
| | | | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-043-0/+184
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Make Flickable's wheel handling more like QAbstractScrollArea.Michael Brasser2011-02-022-0/+60
| | | | | | | | | | | | | | | | Vertical scrolling should only affect vertical movement, and horizontal scrolling should only affect horizontal movement. Task-number: QTBUG-7369 Reviewed-by: Martin Jones
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
| |\
| * | Add versioning for new Flickable methods.Martin Jones2011-01-111-0/+43
| | | | | | | | | | | | Task-number: QTBUG-15148
| * | Allow resizing Flickable content about a center point.Martin Jones2010-11-292-0/+81
| | | | | | | | | | | | | | | | | | | | | Useful for zooming via pinch, for example. Task-number: QTBUG-15148 Reviewed-by: Aaron Kennedy
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| |/ | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-231-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | 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
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-296-10/+10
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Add missing auto test files.Martin Jones2010-08-161-0/+7
|
* Handle QGraphicsWidgets in FlickableMartin Jones2010-08-161-0/+37
| | | | | Task-number: QTBUG-12830 Reviewed-by: Michael Brasser
* Expose the Flickable's internal contentItemMartin Jones2010-06-242-0/+10
| | | | | | | | So that dynamically created items can be parented to the contentItem and be flicked with the rest of the content. Task-number: QTBUG-11674 Reviewed-by: Aaron Kennedy
* 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
* Flickable small API changes.Yann Bodson2010-05-121-0/+28
| | | | | | | | | | - Split moving into movingHorizontally anf movingVertically - Split flicking into flickingHorizontally and flickingVertically - Rename flickDirection to flickableDirection - onMovementStarted, onMovementEnded, onFlickStarted and onFlickEnded signals removed Task-number: QTBUG-10572 Reviewed-by: Martin Jones
* Replace Flickable overshoot property with boundsBehaviorMartin Jones2010-04-222-14/+20
| | | | Task-number: QTBUG-9993
* Fix versioning of Qt Declarative's in-built typesAlan Alpert2010-04-214-4/+4
| | | | | | Since we aren't releasing for 4.6, all types are new in 4.7. Task-number: QTBUG-10081
* Rename remaining import Qt 4.6 lines to import Qt 4.7Joona Petrell2010-04-141-4/+4
| | | | | Task-number: Reviewed-by: Martin Jones
* Tweak tests to run in parallelAaron Kennedy2010-04-131-0/+3
|
* Renamed Flickable viewportXXX properties contentXXXMartin Jones2010-02-264-10/+9
| | | | A viewport is the thing you look through, not what you look at.
* Change autotest class prefix from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX ↵Leonardo Sobral Cunha2010-02-241-12/+12
| | | | to QDeclarativeXXX.
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-246-0/+280
QDeclarativeXXX.