summaryrefslogtreecommitdiff
path: root/src/dialogs/qquickplatformfontdialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix ColorDialog.color and FontDialog.font update on acceptJ-P Nurmi2016-08-171-1/+1
| | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-101-1/+1
|\ | | | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| * Doc: Rename conflicting groupTopi Reinio2016-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | A group name 'dialogs' conflicts with a page elsewhere in the documentation. Renamed to be more specific, and removed the \group command - it's not required for generating annotated lists, and was not linked to. Change-Id: I571702ece13d5eb57a984cec47811b7d58cc0121 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.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>
* Doc: Updated documentation for modality propertyVenugopal Shivashankar2015-07-231-1/+1
| | | | | | | | | FontDialog is Qt.NonModal by default. Task-number: QTBUG-47382 Change-Id: Iafa4cbb1f2a7693ff634be2dcb34b5648e1b952d Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@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>
* Remove unnecessary \inqmlmodule parameterAlejandro Exojo2014-12-081-1/+1
| | | | | Change-Id: I1eb87e2037ecf36b7d313d11bf3215fa70d26b59 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Doc: Fix documentation issues for Qt Quick DialogsTopi Reinio2014-10-061-3/+7
| | | | | | | | | | | | | - Document clickedButton property for Dialog, MessageDialog - Update Dialog::accepted() and rejected() documentation - Remove duplicate documentation for Dialog::visible property - Update description of modality property for ColorDialog, FontDialog - Fix broken links Change-Id: I5b73ea5cbccf1ad0203351730197336e1c6e1b98 Reviewed-by: Liang Qi <liang.qi@digia.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>
* Doc: Append handler names to \qmlsignal documentationSze Howe Koh2014-03-181-0/+4
| | | | | Change-Id: I5e06bdf03ba1ba8e5fe7669f690420dc9a039129 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-041-2/+2
| | | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I793aea0f46cc74f6466e52d00c0ec868c6603c77 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Add currentFont property to FontDialog.Liang Qi2014-02-031-0/+8
| | | | | | | | | | | | | | | | | 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/+252
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>
View Lorry Controller Status