[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.0+dfsg-1-257-gb51360c

[Simon Quigley]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=3026a8c

The following commit has been merged in the ubuntu+1 branch:
commit 3026a8cec9d9eaa072c6318ad9a70f693105ccd3
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Sat Jun 10 19:30:40 2017 -0500

    Drop Add-support-for-selecting-the-printer-plugin-via-the.patch
---
 debian/changelog                                   |  1 +
 ...-for-selecting-the-printer-plugin-via-the.patch | 45 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e156aa..f4e7f8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ qtbase-opensource-src (5.9.0+dfsg-1ubuntu1) UNRELEASED; urgency=medium
     - qsettings_simplify_logic.diff
     - vnc_big_endian.diff
     - global_menu_shortcuts.diff
+    - Add-support-for-selecting-the-printer-plugin-via-the.patch
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Thu, 08 Jun 2017 13:48:28 +0300
 
diff --git a/debian/patches/Add-support-for-selecting-the-printer-plugin-via-the.patch b/debian/patches/Add-support-for-selecting-the-printer-plugin-via-the.patch
deleted file mode 100644
index c4e5592..0000000
--- a/debian/patches/Add-support-for-selecting-the-printer-plugin-via-the.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4aebbef8ab94723d59679f30005b114197c995b9 Mon Sep 17 00:00:00 2001
-From: Andrew Hayzen <ahayzen at gmail.com>
-Date: Tue, 22 Nov 2016 11:55:50 +0000
-Subject: [PATCH] Add support for selecting the printer plugin via the env var
-
-Task-number: QTBUG-57260
-Change-Id: I046c8ce5af242cdc7efd23468bbe670d782bdfc0
-Reviewed-by: Friedemann Kleint <Friedemann.Kleint at qt.io>
-Reviewed-by: Andy Shaw <andy.shaw at qt.io>
----
- src/printsupport/kernel/qplatformprintplugin.cpp | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-Index: qtbase-opensource-src-5.8.0/src/printsupport/kernel/qplatformprintplugin.cpp
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/printsupport/kernel/qplatformprintplugin.cpp
-+++ qtbase-opensource-src-5.8.0/src/printsupport/kernel/qplatformprintplugin.cpp
-@@ -42,6 +42,7 @@
- #include "qprinterinfo.h"
- #include "private/qfactoryloader_p.h"
- #include <qcoreapplication.h>
-+#include <qdebug.h>
- 
- #ifndef QT_NO_PRINTER
- 
-@@ -79,8 +80,17 @@ QPlatformPrinterSupport *QPlatformPrinte
- {
-     if (!printerSupport) {
-         const QMultiMap<int, QString> keyMap = loader()->keyMap();
--        if (!keyMap.isEmpty())
--            printerSupport = qLoadPlugin<QPlatformPrinterSupport, QPlatformPrinterSupportPlugin>(loader(), keyMap.constBegin().value());
-+        QMultiMap<int, QString>::const_iterator it = keyMap.cbegin();
-+        if (!qEnvironmentVariableIsEmpty("QT_PRINTER_MODULE")) {
-+            QString module = QString::fromLocal8Bit(qgetenv("QT_PRINTER_MODULE"));
-+            QMultiMap<int, QString>::const_iterator it2 = std::find_if(keyMap.cbegin(), keyMap.cend(), [module](const QString &value){ return value == module; });
-+            if (it2 == keyMap.cend())
-+                qWarning() << "Unable to load printer plugin" << module;
-+            else
-+                it = it2;
-+        }
-+        if (it != keyMap.cend())
-+            printerSupport = qLoadPlugin<QPlatformPrinterSupport, QPlatformPrinterSupportPlugin>(loader(), it.value());
-         if (printerSupport)
-             qAddPostRoutine(cleanupPrinterSupport);
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 5543440..6815b88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # Backported from upstream
 Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
-Add-support-for-selecting-the-printer-plugin-via-the.patch
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging