[SCM] qtbase packaging branch, ubuntu, updated. debian/5.5.1+dfsg-1-60-g17f783e

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 17f783ed12b308c46cd8ed756650c177769036d0
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Oct 16 11:42:36 2015 +0000

    debian/patches/Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch:
    
    * debian/patches/Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch:
      - Fix a qdoc issue (LP: #1447182)
---
 debian/changelog                                   |  2 ++
 ...me-if-Node-logicalModuleName-is-empty-for.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 273711b..c51b7e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ qtbase-opensource-src (5.5.1+dfsg-1ubuntu1) UNRELEASED; urgency=medium
   * debian/patches/Make-sure-networkAccessibilityChanged-is-emitted.patch:
     - Include a network fix from Qt 5.5 branch (merged after 5.5.1)
       (LP: #1470700)
+  * debian/patches/Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch:
+    - Fix a qdoc issue (LP: #1447182)
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 24 Mar 2015 13:56:14 +0000
 
diff --git a/debian/patches/Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch b/debian/patches/Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch
new file mode 100644
index 0000000..de28d2a
--- /dev/null
+++ b/debian/patches/Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch
@@ -0,0 +1,28 @@
+From 72e981a239e0031dd88a5b48862e79588ff53040 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <albert.astals at canonical.com>
+Date: Fri, 16 Oct 2015 13:09:46 +0200
+Subject: [PATCH] Use Node::name if Node::logicalModuleName is empty for qml
+ modules
+
+Change-Id: I55693a4f34f0a89ceb326b5eb4b229dd3f91c172
+---
+ src/tools/qdoc/qdocindexfiles.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp
+index 8961ff7..2262801 100644
+--- a/src/tools/qdoc/qdocindexfiles.cpp
++++ b/src/tools/qdoc/qdocindexfiles.cpp
+@@ -900,6 +900,9 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter& writer,
+     if (node->isQmlModule()) {
+         logicalModuleName = node->logicalModuleName();
+         logicalModuleVersion = node->logicalModuleVersion();
++        if (logicalModuleName.isEmpty()) {
++            logicalModuleName = node->name();
++        }
+         if (!logicalModuleName.isEmpty()) {
+             writer.writeAttribute("qml-module-name", logicalModuleName);
+             if (node->isQmlModule())
+-- 
+2.5.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 6c03043..f98009b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ qt5-qmake-arm-linux-gnueabihf
 Add-workaround-for-GL-on-Android-emulator.patch
 enable-tests.patch
 enable_fonts_always_smoothly.patch
+Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch

-- 
qtbase packaging