summaryrefslogtreecommitdiffstats
path: root/src/dialogs/qquickabstractfontdialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-alpha1Liang Qi2016-08-301-0/+6
|\ | | | | | | Change-Id: I4f85412071d34b44f76870753e171e0beae2e7b9
| * Fix ColorDialog.color and FontDialog.font update on acceptJ-P Nurmi2016-08-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | When using native dialogs, ColorDialog.color was not updated at all, and FontDialog.font was incorrectly following FontDialog.currentFont. Promote the overridden accept() methods to the abstract base classes so the native dialogs get the appropriate property updates on accept the same way compared to the non-native dialogs. Task-number: QTBUG-55298 Change-Id: I9ac8f5ecc60884cd98b58d09ef3dcb4baf47772d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Port to new Q*DialogOptions API (II)Marc Mutz2016-03-031-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Q*DialogOptions are no longer value types, but are held only in QSharedPointers. Consequently, all special member function have been hidden from clients and create() and clone() methods have been added. This change removes the #ifdefs for the old-style API again, leaving only the new API use. Change-Id: I1441ca4010c4654fcaf114a2c96bf99cdc38e93f Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | Port to new Q*DialogOptions APIMarc Mutz2016-02-291-0/+4
|/ | | | | | | | | | | | | | | | | | | Q*DialogOptions are no longer value types, but are held only in QSharedPointers. Consequently, all special member function have been hidden from clients and create() and clone() methods have been added. This change uses a macro defined by the QtBase change to select the API variant. This is needed for the QtBase change to integrate, and needed for as long as the QtBase change hasn't been integrated, yet. A follow-up commit will remove the scaffolding again. Change-Id: I20c1d75fcaa42323862599f2a35b815bc67b39dd Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* Unify license header usageAntti Kokko2016-02-041-12/+15
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Dialogs: update license headersJ-P Nurmi2015-02-111-16/+19
| | | | | | Change-Id: I1abdce308929507416b5f24b4442d0b978886a46 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Update license headers and add new license filesAntti Kokko2014-08-251-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I470909ba0980db33ab551790d619c59a35978590 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Add currentFont property to FontDialog.Liang Qi2014-02-031-0/+9
| | | | | | | | | | | | | | | | | QFontDialog has this property. This patch effectively means that the font property will be set when the dialog closes, instead of whenever the current font in the dialog changes, so pressing cancel will revert the font to what it was before the dialog was opened. Align with e73d503b84be12e7bf28491356b459ca309e7c95 in qtdelarative, the similar change for color dialog. [ChangeLog][QtQuickControls][FontDialog] Added currentFont property. Task-number: QTBUG-36574 Change-Id: I4140966543a677d8e654dbaac170a2fe8d3579a1 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* move QtQuick.Dialogs from qtdeclarative to qtquickcontrolsShawn Rutledge2014-01-031-0/+150
This will enable using Controls in the QML dialog implementations. For now, Controls are used only as drop-in replacements for the Button, Checkbox, and TextField which were custom implementations in the qtdeclarative module before. Change-Id: Ic79e9e8e5715a72ce51f4c724bfdfd33653300f2 Reviewed-by: Liang Qi <liang.qi@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-18 13:23:44 +0000