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
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From e31c79ece49f0893882f9062edc9664926b9b13f Mon Sep 17 00:00:00 2001
|
|
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
Date: Mon, 18 Dec 2017 09:31:11 +0100
|
|
Subject: [PATCH 54/54] QtPrintSupport: Fix build
|
|
|
|
dialogs/qprintdialog_unix.cpp:1104:21: error: incomplete type 'QTextCodec' used in nested name specifier
|
|
|
|
Amends b4330bc391bbb08898f192ea3469b73aed09134c.
|
|
|
|
Task-number: QTBUG-54464
|
|
Change-Id: I555431d11a5c3f247d4f055d94255d2708c92374
|
|
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
|
|
Reviewed-by: David Faure <david.faure@kdab.com>
|
|
---
|
|
src/printsupport/dialogs/qprintdialog_unix.cpp | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
|
|
index d5ad90e85e..9ad9fa35a5 100644
|
|
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
|
|
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
|
|
@@ -49,6 +49,7 @@
|
|
#include "qfiledialog.h"
|
|
#endif
|
|
#include <QtCore/qdir.h>
|
|
+#include <QtCore/qtextcodec.h>
|
|
#include <QtGui/qevent.h>
|
|
#if QT_CONFIG(filesystemmodel)
|
|
#include <QtWidgets/qfilesystemmodel.h>
|
|
--
|
|
2.15.1
|
|
|