summaryrefslogtreecommitdiffstats
path: root/src/animation/frontend/qadditiveclipblend.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-231-19/+19
| | | | | | | | | | | This reverts commit 03e5f60e585701608c1181365faee484d7a1f14c. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I359e89ed77b1b2750607617d138ebb6c316f0296 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update commercial license headersTarja Sundqvist2021-02-021-19/+19
| | | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qt3d. Examples, documentation files or tests are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4155 Change-Id: I139c8ad72c042b0900239decc36cfed4bc1c4951 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Doc: correct declaration qml propertiesNico Vertriest2017-08-111-2/+2
| | | | | | | | | | qadditiveclipblend.cpp:173: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode baseClip qadditiveclipblend.cpp:191: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode additiveClip qblendedclipanimator.cpp:276: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode blendTree qclipanimator.cpp:124: warning: Unrecognizable QML module/component qualifier for AbstractAnimationClip clip Change-Id: Ic761f75986e41dc4ec7ab9e97e6776e49498f870 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Doc: correct \property and \qmlproperty statementsNico Vertriest2017-06-191-5/+5
| | | | | | | | | | | | functionrangefinder.cpp:54: warning: Invalid syntax in '\fn' qabstractclipanimator.cpp:127: warning: Unrecognizable QML module/component qualifier for bool running qabstractclipanimator.cpp:168: warning: Unrecognizable QML module/component qualifier for int loops qadditiveclipblend.cpp:173: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode baseClip qadditiveclipblend.cpp:191: warning: Unrecognizable QML module/component qualifier for AbstractClipBlendNode additiveClip qabstractclipanimator.h:62: warning: No documentation for Qt3DAnimation::QAbstractClipAnimator::Loops Change-Id: Iab2686f55149a6998eac81ca0aab991b815b12d9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Document QAdditiveClipBlendSean Harmer2017-04-271-49/+74
| | | | | Change-Id: I8cc48899e31a32f6c1dd9f4f56e3a5fa846bd8f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add baseClip and additiveClip properties to QAdditiveClipBlendSean Harmer2017-02-241-0/+55
| | | | | | | | Also added corresponding backend node properties. Task-number: QTBUG-58903 Change-Id: I4b441e305c1ddfc062b215b713a6b894960cdd4b Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Rename blendFactor on QAdditiveClipBlend to additiveFactorSean Harmer2017-02-241-10/+10
| | | | | | | | Likewise for the backend node. Task-number: QTBUG-58903 Change-Id: I2a2d084f80cf5b36a2ba6c1c03f511a1f74a2f62 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Rename QAdditiveBlend -> QAdditiveClipBlendSean Harmer2017-02-241-0/+174
Also rename backend type accordingly. Task-number: QTBUG-58903 Change-Id: Ia1ad670937487dd84768e79d8c2be59ed3b6d0a5 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>