summaryrefslogtreecommitdiffstats
path: root/src/extras/text/qtext2dmaterial.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-091-0/+2
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I81f01dbde95cc9cd8e98c7fb9bf3a390aa27f379
| * Qt3DExtras: includemocsMike Krus2022-07-151-0/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-103286 Change-Id: I07cce1da294d45a03bc1d0b9ef18629bba3a48e0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 400689d358f9c8dc05e556b04ff928ad32930c81) Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-231-20/+20
|/ | | | | | | | | | | 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-20/+20
| | | | | | | | | | | | | | | | 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>
* QDistanceFieldText cleanupPaul Lemire2017-02-231-0/+179
-renamed QDistanceFieldText to QText2DEntity -renamed QDistanceFieldMaterial to QText2DMaterial -removed fontScale property -replace position property by width/height properties -adjusted manual test accordingly Task-number: QTBUG-58883 Change-Id: Ieb1aae2ef8f397e3a6a636ad651cf83a5565daa0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>