diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-13 17:24:25 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-20 08:20:38 +0000 |
| commit | b2799062f365fb1d4c9820d33fd38cf5510d2ade (patch) | |
| tree | 7e970dbef7f3be30818fccb83a0716c2b72951d5 /src/plugins/platformthemes/gtk3 | |
| parent | e416cc553d997121657c753aec02aebb968e3cc0 (diff) | |
GTK+ dialogs: do not emit duplicate selected signals
As mentioned in the bug report, these are already emitted in:
- QColorDialog::done(Accepted)
- QFileDialog::done()
- QFontDialog::accepted()
The same signal emissions were reverted from the Cocoa dialogs
in 916a8c44c4a9ba639e89660226d14d51ed44feaa.
For QtQuick Dialogs, these don't matter because they handle this
in accepted().
Task-number: QTBUG-55298
Change-Id: I7990836745b160ec8de948697e2924322a583b6c
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/plugins/platformthemes/gtk3')
| -rw-r--r-- | src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp index a18d67bf03..c2a116b03c 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp +++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp @@ -218,7 +218,6 @@ QColor QGtk3ColorDialogHelper::currentColor() const void QGtk3ColorDialogHelper::onAccepted() { emit accept(); - emit colorSelected(currentColor()); } void QGtk3ColorDialogHelper::onColorChanged(QGtk3ColorDialogHelper *dialog) @@ -357,11 +356,6 @@ QString QGtk3FileDialogHelper::selectedNameFilter() const void QGtk3FileDialogHelper::onAccepted() { emit accept(); - - QList<QUrl> files = selectedFiles(); - emit filesSelected(files); - if (files.count() == 1) - emit fileSelected(files.first()); } void QGtk3FileDialogHelper::onSelectionChanged(GtkDialog *gtkDialog, QGtk3FileDialogHelper *helper) @@ -593,7 +587,6 @@ QFont QGtk3FontDialogHelper::currentFont() const void QGtk3FontDialogHelper::onAccepted() { emit accept(); - emit fontSelected(currentFont()); } void QGtk3FontDialogHelper::onFontChanged(QGtk3FontDialogHelper *dialog) |