aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickdialogs2/quickdialogs2quickimpl/qquickplatformfontdialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-6.2.6' into ↵Tarja Sundqvist2023-03-011-0/+2
|\ | | | | | | | | | | tqtc/lts-6.2-opensource Change-Id: Ie5a87ae61d8ed0429225353ad46e5232d60f4daa
| * QuickDialogs2QuickImpl: includemocsMarc Mutz2022-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Including moc files directly into their classes' TU tends to improve codegen and enables extended compiler warnings, e.g. about unused private functions or fields. Manual conflict resolutions: - dropped all includes into non-existing files Task-number: QTBUG-102948 Change-Id: I69a76a7e25c2f260801190ef1803b561b7300b5d Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 9021e0de909aa757918c25d5f98a57f60035775a)
* | Revert "Update commercial license headers"Tarja Sundqvist2022-11-241-22/+22
|/ | | | | | | | | | | This reverts commit 74089697cf2a4961fb697100555b17ae2342d734. Revert of commercial license headers is required for the Qt 6.2.x opensource releases, Qt 6.2.5 onwards. Task-number: QTBUG-107760 Change-Id: Id49069cb5e5f261da185fd082dfb71deb259d387 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update commercial license headersTarja Sundqvist2022-06-041-22/+22
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtdeclarative. Examples, tests, or documentation files 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-4941 Change-Id: I32f554b0a8cb527f74d46f3c02b0e745d9fc5ddf Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QuickFontDialog: make setCurrentFont() update listview indexesOliver Eftevaag2021-11-031-2/+3
| | | | | | | | | | | | | | | | | | For the non-native implementation of the QQuickFontDialog, when the qml user assigns a new font to the currentFont property, the list view indexes should be changed to point the family, style and pointSize of the new font. In cases where the family, style or size of the new font exists in the model for the representing listview, the index for that listview should be updated to the new value, or 0 if the value isn't found, or -1 if the model is empty. Fixes: QTBUG-96934 Change-Id: Ia7bb11d01c4a0807d0df742f34bd8aefb00104f6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 3c15f90fc6b4f2b5689eaa8b70fb5ca76237540d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update copyright header to refer to Qt Quick DialogsOliver Eftevaag2021-06-091-1/+1
| | | | | | | | | | The source files in Qt Quick Dialogs should now have a copyright header that mentions they are indeed a part of the Qt Quick Dialogs module. Change-Id: I855edbca61f8e5c2a08dea50b5c70f1cdb3f996f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 74ab735615b74d3f91748f069d9f24b5ab73adbf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add FontDialog to QtQuick.DialogsOliver Eftevaag2021-06-041-0/+173
Adding non-native FontDialog to QtQuick. This is a native FontDialog on platforms that support it, and a non-native Qt Quick FontDialog on platforms that don't. Fixes: QTBUG-87799 Change-Id: I43a59e3668a8a40f1d0c04a3c2506283d552a22b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>