diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:21 +0200 |
| commit | 66b68ed94032e03b7a0ed9d15f72b1fc5e2cb729 (patch) | |
| tree | e0093cca956690a272f9415a2743064ec1d3dd71 /src/dialogs | |
| parent | be50531985f64089c87289ba0c026007437517a2 (diff) | |
| parent | 6afc4815a1e20f795591ef7d1452a521920ce0bd (diff) | |
| download | qtquickcontrols-66b68ed94032e03b7a0ed9d15f72b1fc5e2cb729.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ifec0f56816809abb90a294b8462391cb7e54c87d
Diffstat (limited to 'src/dialogs')
| -rw-r--r-- | src/dialogs/qquickplatformfontdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/qquickplatformfontdialog.cpp b/src/dialogs/qquickplatformfontdialog.cpp index 4cc53094..8b93fd1d 100644 --- a/src/dialogs/qquickplatformfontdialog.cpp +++ b/src/dialogs/qquickplatformfontdialog.cpp @@ -190,7 +190,7 @@ QPlatformFontDialogHelper *QQuickPlatformFontDialog::helper() containing the dialog's parent Item, modal with respect to the whole application, or non-modal. - By default it is \c Qt.WindowModal. + By default it is \c Qt.NonModal. Modality does not mean that there are any blocking calls to wait for the dialog to be accepted or rejected; it's only that the user will be |