[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.7.1+dfsg-2ubuntu2-2-g240754c

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 240754c2ac1822927dd1b53d31a0e63f31d3873d
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jan 30 09:00:19 2017 +0000

    debian/patches/Add-support-for-selecting-the-printer-plugin-via-the.patch:
    
    * debian/patches/Add-support-for-selecting-the-printer-plugin-via-the.patch:
      - Backport from Qt 5.9.
---
 debian/changelog                                   |  7 +++-
 ...-for-selecting-the-printer-plugin-via-the.patch | 45 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ee8327b..7e6a7fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 qtbase-opensource-src (5.7.1+dfsg-2ubuntu3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
   * Backport upstream change to make shortcuts working with global menu
     on Unity (global_menu_shortcuts.diff, LP: #1380702).
 
- -- Dmitry Shachnev <mitya57 at ubuntu.com>  Wed, 25 Jan 2017 20:38:18 +0300
+  [ Timo Jyrinki ]
+  * debian/patches/Add-support-for-selecting-the-printer-plugin-via-the.patch:
+    - Backport from Qt 5.9.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 30 Jan 2017 09:02:08 +0000
 
 qtbase-opensource-src (5.7.1+dfsg-2ubuntu2~1) zesty; urgency=medium
 
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
new file mode 100644
index 0000000..e3f28f9
--- /dev/null
+++ b/debian/patches/Add-support-for-selecting-the-printer-plugin-via-the.patch
@@ -0,0 +1,45 @@
+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.7.1/src/printsupport/kernel/qplatformprintplugin.cpp
+===================================================================
+--- qtbase-opensource-src-5.7.1.orig/src/printsupport/kernel/qplatformprintplugin.cpp
++++ qtbase-opensource-src-5.7.1/src/printsupport/kernel/qplatformprintplugin.cpp
+@@ -42,6 +42,7 @@
+ #include "qprinterinfo.h"
+ #include "private/qfactoryloader_p.h"
+ #include <qcoreapplication.h>
++#include <qdebug.h>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -77,8 +78,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 a4b0e1f..e616e41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,7 @@ Fix-some-QtDBus-crashes-during-application-destructi.patch
 Make-the-bearer-QFactoryLoader-a-member-variable-not.patch
 Stop-unloading-plugins-in-QPluginLoader-and-QFactory.patch
 global_menu_shortcuts.diff
+Add-support-for-selecting-the-printer-plugin-via-the.patch
 
 # Debian specific.
 no_dbus_dependency.diff

-- 
qtbase packaging