summaryrefslogtreecommitdiffstats
path: root/src/dialogs/qquickplatformmessagedialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Don't conflict with Qt Quick Controls 2 when using the platform dialogsAndy Shaw2018-03-121-6/+6
| | | | | | Change-Id: I7ca87ee59c8d65537713d5d912fdb3ec5bd7dcdb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> 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>
* 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-0/+6
| | | | | | | | | | | | | - 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: Use \value command for documenting flags for QML propertiesTopi Reinio2014-08-051-40/+60
| | | | | | | | | | | | Replace the table structure with \value commands for documenting acceptable values for Dialog::standardButtons and MessageDialog::standardButtons properties, and remove the unnecessary \enum definitions. Task-number: QTBUG-35019 Change-Id: Ifcb9ae8b2fbe6859fae324d855a395e4d1d224c1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Doc: Append handler names to \qmlsignal documentationSze Howe Koh2014-03-181-0/+16
| | | | | Change-Id: I5e06bdf03ba1ba8e5fe7669f690420dc9a039129 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Document signals (not handlers) under \qmlsignalSze Howe Koh2014-03-181-8/+8
| | | | | | | Task-number: QTBUG-35846 Change-Id: I358c3427429b669425f0065686da7e202568c84d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Native MessageDialog: connect the new version of the clicked signalShawn Rutledge2014-03-101-2/+2
| | | | | | | | | After f212322a6ecb237d5fb53e56c6dafffb87e45f09 there was a warning on connect, and it was not possible to dismiss a native MessageDialog (for example on Android). Change-Id: I12f62d5bdb61176ea2ff08c6be3731010cb47d45 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* 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>
* move QtQuick.Dialogs from qtdeclarative to qtquickcontrolsShawn Rutledge2014-01-031-0/+398
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>