[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.4.2+dfsg-2ubuntu1-37-ge7607b0

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit a16963a636d72ae146135b725f87e5452f2f4823
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Sun Jul 5 12:10:11 2015 +0000

      * Replace load_testability_from_env_var.patch with upstreamed
        Add-environment-variable-support-for-testability-lib.patch
      * Drop patches in upstream:
        - Correct-typo-in-the-Gujarati-openType-identififer.patch
---
 debian/changelog                                   |  4 +++
 ...ment-variable-support-for-testability-lib.patch | 35 ++++++++++++++++++++++
 ...typo-in-the-Gujarati-openType-identififer.patch | 30 -------------------
 debian/patches/load_testability_from_env_var.patch | 17 -----------
 debian/patches/series                              |  2 +-
 5 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3441dbf..191092c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ qtbase-opensource-src (5.5.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release.
     (LP: #1437206) (LP: #1450137)
+  * Replace load_testability_from_env_var.patch with upstreamed
+    Add-environment-variable-support-for-testability-lib.patch
+  * Drop patches in upstream:
+    - Correct-typo-in-the-Gujarati-openType-identififer.patch
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 24 Mar 2015 13:56:14 +0000
 
diff --git a/debian/patches/Add-environment-variable-support-for-testability-lib.patch b/debian/patches/Add-environment-variable-support-for-testability-lib.patch
new file mode 100644
index 0000000..8cdbd5d
--- /dev/null
+++ b/debian/patches/Add-environment-variable-support-for-testability-lib.patch
@@ -0,0 +1,35 @@
+From 322e1245c64144d072c8ca1ec686709e611ab3cb Mon Sep 17 00:00:00 2001
+From: Timo Jyrinki <timo.jyrinki at canonical.com>
+Date: Tue, 24 Feb 2015 14:12:38 +0000
+Subject: [PATCH] Add environment variable support for testability library use.
+
+Add the option to load the testability library based on whether
+an environment variable QT_LOAD_TESTABILITY is set, in addition
+to the current "-testability" flag.
+
+This improves the use of testability library together with the
+autopilot functional testing tool.
+
+Task-number: QTBUG-32974
+Change-Id: I6abf2c004cbff2ce0aff44e24a99bcc8188a52ae
+---
+ src/gui/kernel/qguiapplication.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
+index 1467c96..abbbff5 100644
+--- a/src/gui/kernel/qguiapplication.cpp
++++ b/src/gui/kernel/qguiapplication.cpp
+@@ -1315,6 +1315,9 @@ void QGuiApplicationPrivate::init()
+ #endif
+ 
+ #ifndef QT_NO_LIBRARY
++    if (qEnvironmentVariableIntValue("QT_LOAD_TESTABILITY") > 0)
++        loadTestability = true;
++
+     if (loadTestability) {
+         QLibrary testLib(QStringLiteral("qttestability"));
+         if (testLib.load()) {
+-- 
+2.1.4
+
diff --git a/debian/patches/Correct-typo-in-the-Gujarati-openType-identififer.patch b/debian/patches/Correct-typo-in-the-Gujarati-openType-identififer.patch
deleted file mode 100644
index 08646c1..0000000
--- a/debian/patches/Correct-typo-in-the-Gujarati-openType-identififer.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ef22739f47857c185f63f87966df79d377c89577 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning at theqtcompany.com>
-Date: Mon, 23 Feb 2015 11:05:07 +0100
-Subject: [PATCH] Correct typo in the Gujarati openType identififer.
-
-Based on testing by Paresh Adhia.
-
-Task-number: QTBUG-44568
-Change-Id: I0a84710bcda40f65b38c3b18f4d9b34f654e4c22
-Reviewed-by: Konstantin Ritt <ritt.ks at gmail.com>
----
- src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
-index 17e9d07..bd22a8f 100644
---- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
-+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
-@@ -279,7 +279,7 @@ static const char *openType[] = {
-     "deva",  // Devanagari
-     "beng",  // Bengali
-     "guru",  // Gurmukhi
--    "gurj",  // Gujarati
-+    "gujr",  // Gujarati
-     "orya",  // Oriya
-     "taml",  // Tamil
-     "telu",  // Telugu
--- 
-2.1.4
-
diff --git a/debian/patches/load_testability_from_env_var.patch b/debian/patches/load_testability_from_env_var.patch
deleted file mode 100644
index 77df934..0000000
--- a/debian/patches/load_testability_from_env_var.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: load testability from environment variable
-Author: Thomi Richards <thomi.richards at canonical.com>
-Forwarded: https://bugreports.qt-project.org/browse/QTBUG-32974
-
-diff -urN qtbase-opensource-src-5.0.2+dfsg1.old/src/widgets/kernel/qapplication.cpp qtbase-opensource-src-5.0.2+dfsg1/src/widgets/kernel/qapplication.cpp
---- qtbase-opensource-src-5.0.2+dfsg1.old/src/gui/kernel/qguiapplication.cpp	2013-04-09 03:11:06.000000000 +0300
-+++ qtbase-opensource-src-5.0.2+dfsg1/src/gui/kernel/qguiapplication.cpp	2013-08-08 10:07:56.982957641 +0300
-@@ -1253,6 +1253,9 @@
-         argv[j] = 0;
-         argc = j;
-     }
-+
-+    if (qgetenv("QT_LOAD_TESTABILITY").toInt() > 0)
-+        loadTestability = true;
- 
-     // Load environment exported generic plugins
-     foreach (const QByteArray &plugin, qgetenv("QT_QPA_GENERIC_PLUGINS").split(','))
diff --git a/debian/patches/series b/debian/patches/series
index aa70283..1bcb95c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 # Backported stuff
-load_testability_from_env_var.patch
+Add-environment-variable-support-for-testability-lib.patch
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging