forked from pool/libqt5-qtbase
69da80a0af
- Add 0001-Fix-custom-page-size-handling-in-the-Unix-print-dial.patch to fix custom page size handling in the Unix print dialog (QTBUG-58733) - Add patches from upstream to reintroduce the advanced tab in the Qt printer properties dialog: 0001-Remove-QPrintDialogPrivate-applyPrinterProperties-no.patch 0002-Remove-QUnixPrintWidgetPrivate-applyPrinterPropertie.patch 0003-Remove-QPrintPropertiesDialog-applyPrinterProperties.patch 0004-Remove-QCupsJobWidget-setPrinter.patch 0005-Remove-QPrintPropertiesDialog-selectPrinter.patch 0006-Remove-QPageSetupWidget-selectPrinter.patch 0007-Introduce-QPrintDevice-property-setProperty.patch 0008-Allow-access-to-ppd-file-and-ppdMarkOption-via-QPpdP.patch 0009-QPlatformPrintDevice-use-QVector-not-QList-in-the-AP.patch 0010-Reintroduce-the-Advanced-tab-in-the-QPrintProperties.patch 0011-QtPrintSupport-Fix-build.patch - Small change in 0001-Add-remote-print-queue-support.patch so 0007-Allow-access-to-ppd-file-and-ppdMarkOption-via-QPpdP.patch applies cleanly. - Update the license tag (boo#967696) - Update to 5.10.0 final * New bugfix release - Update to 5.10.0 RC 2 * New bugfix release - Update to 5.10.0 RC 1 * New bugfix release OBS-URL: https://build.opensuse.org/request/show/558896 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=71
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From 2ecfdf87b8362309f555e441f16e6c5b56f17e63 Mon Sep 17 00:00:00 2001
|
|
From: Albert Astals Cid <albert.astals.cid@kdab.com>
|
|
Date: Mon, 4 Dec 2017 12:42:54 +0100
|
|
Subject: [PATCH 02/54] Remove QPrintDialogPrivate::applyPrinterProperties, no
|
|
one calls it
|
|
|
|
Change-Id: Ic140f62e5cb63c6a4b7f4fa10ca243d8bb055c4e
|
|
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
|
---
|
|
src/printsupport/dialogs/qprintdialog_unix.cpp | 8 --------
|
|
1 file changed, 8 deletions(-)
|
|
|
|
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
|
|
index 183af7daa3..37a562125e 100644
|
|
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
|
|
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
|
|
@@ -203,8 +203,6 @@ public:
|
|
~QPrintDialogPrivate();
|
|
|
|
void init();
|
|
- /// copy printer properties to the widget
|
|
- void applyPrinterProperties();
|
|
|
|
void selectPrinter(const QPrinter::OutputFormat outputFormat);
|
|
|
|
@@ -390,12 +388,6 @@ void QPrintDialogPrivate::selectPrinter(const QPrinter::OutputFormat outputForma
|
|
options.pageSetCombo->setEnabled(true);
|
|
}
|
|
|
|
-void QPrintDialogPrivate::applyPrinterProperties()
|
|
-{
|
|
- // apply printer options to property dialog
|
|
- top->d->applyPrinterProperties();
|
|
-}
|
|
-
|
|
void QPrintDialogPrivate::setupPrinter()
|
|
{
|
|
// First setup the requested OutputFormat, Printer and Page Size first
|
|
--
|
|
2.15.1
|
|
|