diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
| commit | d3a8bc803cd7c4ce106038bfc4b37cdd6bb8e177 (patch) | |
| tree | 3b6db0d4869f334d0eb4559c5ae457995cbe913e /src/printsupport/dialogs | |
| parent | d934ddc297f6db94dbc548fe01da64350f13577d (diff) | |
| parent | 47a7628023610904c6ac52e23fa289f75f349b4e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/json/qjsonwriter.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbkeyboard.cpp
Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
Diffstat (limited to 'src/printsupport/dialogs')
| -rw-r--r-- | src/printsupport/dialogs/qabstractprintdialog.cpp | 3 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qprintpreviewdialog.cpp | 11 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/printsupport/dialogs/qabstractprintdialog.cpp b/src/printsupport/dialogs/qabstractprintdialog.cpp index ff446d4fad..6951d8c7bc 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.cpp +++ b/src/printsupport/dialogs/qabstractprintdialog.cpp @@ -404,8 +404,7 @@ void QAbstractPrintDialogPrivate::setPrinter(QPrinter *newPrinter) Mac OS X. This is no longer supported in Qt 4.5. If you want this functionality, use QPrintDialog::open(). - \sa QPageSetupDialog, QPrinter, {Pixelator Example}, {Order Form Example}, - {Image Viewer Example}, {Scribble Example} + \sa QPageSetupDialog, QPrinter */ /*! diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp index 9fa430e17e..4692fb5c3c 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.cpp +++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp @@ -562,15 +562,8 @@ void QPrintPreviewDialogPrivate::_q_print() #if defined(Q_OS_WIN) || defined(Q_OS_MAC) if (printer->outputFormat() != QPrinter::NativeFormat) { - QString title; - QString suffix; - if (printer->outputFormat() == QPrinter::PdfFormat) { - title = QCoreApplication::translate("QPrintPreviewDialog", "Export to PDF"); - suffix = QLatin1String(".pdf"); - } else { - title = QCoreApplication::translate("QPrintPreviewDialog", "Export to PostScript"); - suffix = QLatin1String(".ps"); - } + QString title = QCoreApplication::translate("QPrintPreviewDialog", "Export to PDF"); + QString suffix = QLatin1String(".pdf"); QString fileName = QFileDialog::getSaveFileName(q, title, printer->outputFileName(), QLatin1Char('*') + suffix); if (!fileName.isEmpty()) { |