aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
|\ | | | | | | Change-Id: I795e581ccc6925d55723a17e3dd27faa6e93cfcf
| * Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
|/ | | | | | | + 7f05ba0039134598dffa17c2ef3e234b5e27241a Bump version Change-Id: Ic7c1bace160ab44e190f179715ba06a0b8fb23e8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | Change-Id: I9b715258e0346781ad3cf27ae428f0457a7fb957
* Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
|\ | | | | | | Change-Id: I3b2f49d6fa09c0ecfba3c9071d6e615481460111
| * Merge 5.14 into 5.14.1v5.14.1Kari Oikarinen2020-01-151-0/+18
| |\ | |/ |/| | | Change-Id: I52881d3035ba1eda9bb4e59908f7cbefaf61affb
* | Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2020-01-101-0/+18
|\ \ | | | | | | | | | Change-Id: I41fa6b941c2143e6c3abc0b9758c79a4acdfc5d7
| * | Add changes file for Qt 5.14.0v5.14.0Antti Kokko2019-12-031-0/+18
| | | | | | | | | | | | | | | Change-Id: I3092e3837f813edc6dc37b3980a746c55725342a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * Add changes file for Qt 5.14.1Antti Kokko2020-01-101-0/+20
| |/ |/| | | | | | | Change-Id: Ic3e2150b472eac3d69e580bcbe4e046ff5e525fa Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: I3477118cc24d1e7691b8ac2df4f96729f6668666
* | Remove flaky test caseThomas Hartmann2019-11-271-5/+0
|/ | | | | | | | The timeout already is ridiculously high. Task-number: QTBUG-80367 Change-Id: I7197021e7312a76d4a0b9d507f220731ceb56ad5 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* docs: Polish description to get straight to the pointv5.14.0-rc1Kavindra Palaraja2019-11-191-4/+3
| | | | | Change-Id: I7a5410f48c8dc91e90bcf4786e582e30214b5b3f Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Add git-archive export optionsv5.14.0-beta3v5.14.0-beta2Antti Kokko2019-10-092-0/+4
| | | | | | | | Add .gitattributes, no export for .gitattributes and .gitignore Add .tag file to store the sha1 of the commit being packaged Change-Id: I41dd85a4f1602ad93e7c9bc597aeadfd15e1ef71 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Update plugins.qmltypes for 5.14v5.14.0-beta1Kai Koehne2019-09-271-1/+1
| | | | | | | Task-number: QTBUG-78690 Change-Id: If3627ac414a499544af6b826573444e4927c29e0 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Set version to 5.14.0v5.14.0-alpha1Kari Oikarinen2019-09-101-1/+1
| | | | | Change-Id: Iec71cbd823105b35d5fb5dfa4fe34229dc6b2a4b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Rename top level project file to match module nameAlessandro Portale2019-08-231-0/+0
| | | | | | | | ... otherwise the module does not get built with a top- level Qt build. And we want to get it built, right? :) Change-Id: Idb4a22acd25b111a69a1b172b46dce9b8c9bfd33 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Ensure the timeline is updated if frame properties changev1.0.01.0Thomas Hartmann2019-05-242-0/+13
| | | | | | | | If the frame number or the easing curve of a frame change, then we have to update the timeline. Change-Id: Id2a1b571727fa5414d62bf0bc549699c28da0dcd Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix plugins.qmltypesThomas Hartmann2019-05-161-81/+3
| | | | | Change-Id: I6144f307db04c6cb2bab1389a404dd3a1d59209f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Rename keyframes of timeline to keyframeGroupsThomas Hartmann2019-05-102-16/+15
| | | | | Change-Id: I11903e84be5736ee901a492cbe52331a6af8477a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Add missing explicitThomas Hartmann2019-05-102-2/+2
| | | | | Change-Id: I2b2fe469d5702f8730f096e199334b0aaa9df18f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix some style issuesThomas Hartmann2019-05-092-6/+3
| | | | | Change-Id: Ia635d03f92834db55208dc38211d7892569040ee Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Sanitize the code baseThomas Hartmann2019-05-094-51/+38
| | | | | Change-Id: I58c006a12e90ac05e2286c28f08be0dca6d78532 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Remove qrc fileThomas Hartmann2019-05-093-16/+0
| | | | | Change-Id: Ia790e1e36bddbb231f5aaf16fd15dffafe3ca106 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix flaky testThomas Hartmann2019-05-091-1/+1
| | | | | | | On the CI the animation seems to require more time to finish. Change-Id: Ia79aab272d21401186b592a9b0257b6394261ad5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Add some more documentationThomas Hartmann2019-05-077-1/+192
| | | | | Change-Id: I150e2344a9a489464fb7b4e5157471472a906afa Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Add testsThomas Hartmann2019-05-077-1/+962
| | | | | | Task-number: QDS-56 Change-Id: Iddbfc2cd9aaf1170a79a75bfd93f517f441d5f69 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix buildThomas Hartmann2019-05-021-1/+1
| | | | | Change-Id: I56bff850bae6ee2d58203f8487c004e14da366b0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Handle vector types properlyThomas Hartmann2019-04-301-4/+16
| | | | | | | | | | | The user type for a 'dot' properly will be the user type of the vector property and conversion will fail. To fix this we adjust the user property to double. Also the user property is cached and some warnings were added. Change-Id: Ic3eb05c5b712eaf2fff272b145ffd47100411e2a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix 'discrete' animationsThomas Hartmann2019-04-301-2/+6
| | | | | | | | If interpolation is not possible the 'animation' did happen one frame to late. Change-Id: I320c3e5e2e62c9fe204d39441d6a2e3456a89691 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Refresh timeline when keyframe is changedThomas Hartmann2019-04-303-3/+12
| | | | | | Task-number: QDS-231 Change-Id: Ic7be286d7245254f5491c40bbc208c76ea17690f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Remove unused licenseThomas Hartmann2019-02-211-165/+0
| | | | | | Change-Id: Ic0cfdf9d4b66130bb40b72ac45a510fb476f6082 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Adjust licenseThomas Hartmann2019-01-227-282/+60
| | | | | Change-Id: If538d3ade9b6094c02f5410835f8255b6481f37a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Doc: Add docs for the QtQuick.Timeline QML typesLeena Miettinen2019-01-149-3/+466
| | | | | Change-Id: I7457356292c7396fbcf69a7038c5075428153e7f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Remove unused .pri fileThomas Hartmann2018-12-132-4/+0
| | | | | | Change-Id: Icf7a564003d09653d89893f301759936fd817b8e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Add more manual testsThomas Hartmann2018-10-316-0/+783
| | | | | Change-Id: Ib845f33091c43aff1fe574e2864fe3b59f3c6cf1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix static buildsThomas Hartmann2018-10-311-0/+9
| | | | | | | | This reverts commit 4fb53837b67da5ee57a66e719d3112290e55ff2a and fixes the argument of the Q_INIT_RESOURCE(qmake_QtQuick_Timeline). Change-Id: Ib8efc7c7fff39ee13089eafecefba9fd4a98f2a9 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* remove initResources codeTim Jenssen2018-10-301-9/+0
| | | | | | | | We have no content here and Qt 5.12 uses a slightly different solution for the static resources. Change-Id: I1f5af1f86d77c11780cffc5b7ef71952a38c7af2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Add open source licenses referred to in license headersSamuli Piippo2018-08-233-0/+1178
| | | | | Change-Id: Ic4ce76943596e552f732bd843bff21b316ddcae0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* add an opensource licenseTim Jenssen2018-08-237-28/+161
| | | | | Change-Id: Ie81c9ab71d07625d3fc8d72e9fc6cb8e3b89f05f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* prepare for ciTim Jenssen2018-08-2314-89/+154
| | | | | | | | | - update .gitignore - add empty unit test directory - fix license headers Change-Id: Ie11bd02c8a1fb38a42cc6002b2c832e3d77709be Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* test05.qml: Make the namings of states and animations more consistentAlessandro Portale2018-04-271-42/+34
| | | | | Change-Id: Iebc766ecb7c0e12bfc904ab2defa0da205b8f551 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Add TimelineAnimationThomas Hartmann2018-04-2713-33/+858
| | | | | | | | | | | * New api to define animation clips * Special animation type for timeline * Adding ping pong for TimelineAnimation * Adjusting manual tests * Adding new manual tests Change-Id: Ic670b389062ef4ac92e000bc99574e5fa04a7006 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Check if interpolator existsThomas Hartmann2018-04-271-0/+3
| | | | | | | | If no interpolated exists simply return the value of the previews keyframe. Change-Id: Iae65caa0000c22fe594deab6300228552e9f5ed6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix crashThomas Hartmann2018-04-271-1/+6
| | | | | | | The property we are trying to interpolate Change-Id: I48e99e8a603a6bc1749f1da8fcb7461c13b87f7e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Rename Keyframes to KeyframeGroupThomas Hartmann2018-04-189-79/+79
| | | | | Change-Id: I3c31e2a3ab576e2293d1c8dd3d60b6d4550777e4 Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
* Rename KeyframeMutator to TimelineThomas Hartmann2018-04-109-74/+74
| | | | | | | Also renaming the class and tests. Change-Id: I6037c00608c7fc31eb9e8c969d8b67861dbf5711 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Add plugins.qmltypesThomas Hartmann2017-12-153-1/+46
| | | | | Change-Id: I6889edad4ca8d5acf4a3107aa9135e316303f31c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix crashThomas Hartmann2017-12-141-3/+6
| | | | | | | | The timeline was crashing if the target was undefined e.g. the id was missing. Change-Id: I3633481d6431f2d0a61ae770e865f3bc8a70ab37 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Ensure we interpolate from the default value to the first keyframeThomas Hartmann2017-12-051-3/+17
| | | | | | | | | This allows the user to just add a single keyframe. The default value of the item is implictly interpreted as a keyframe at startFrame. Change-Id: I3a87cf6af8c52be9792b8b48a571034f1f74725e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Fix gcc-buildKnud Dollereder2017-11-301-2/+2
| | | | | Change-Id: I58fc18779decd0f4691481274aea8c2a3415bb7d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Initial commitThomas Hartmann2017-11-2921-0/+1459
| | | | | | | | | This implements the timeline module for keyframe based animations in Qt Quick. Change-Id: Icf4a4191da7580f670a02ef52e4b0bee4befed18 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>