diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 11:27:37 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-26 11:27:37 +0000 |
| commit | 0a1af55a9b69f7fd58dbce43a0d4c1faf0143838 (patch) | |
| tree | 26da168e740734d168be37803abec2f8739b213d /src/printsupport | |
| parent | b8fb0ee999d32401157be8d86e5a03185aadbb9e (diff) | |
| parent | 158a3a4159bdc5a49caecd63e021dacbc06cf23c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index b1e5b2962c..9b08ffe4df 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -124,9 +124,6 @@ public: void applyPrinterProperties(QPrinter *p); void setupPrinter() const; -protected: - void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; - private: friend class QUnixPrintWidgetPrivate; Ui::QPrintPropertiesWidget widget; @@ -280,11 +277,6 @@ void QPrintPropertiesDialog::selectPrinter(QPrinter::OutputFormat outputFormat, widget.pageSetup->selectPrinter(outputFormat, printerName); } -void QPrintPropertiesDialog::showEvent(QShowEvent* event) -{ - event->accept(); -} - //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// |