[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-16ubuntu1-3-gf833ba6

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 2b26aeb3fe2e3ee3abf7db9833d630bccaae9445
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Mar 22 09:09:03 2016 +0000

    debian/patches/qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch
    
    * debian/patches/qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch:
      - Fix typos in property definitions. (LP: #1557259)
---
 debian/changelog                                   |  7 ++++
 ...ML-read-only-and-default-qualifiers-in-br.patch | 49 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 966a20c..d1c57bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.5.1+dfsg-16ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch:
+    - Fix typos in property definitions. (LP: #1557259)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 22 Mar 2016 09:09:08 +0000
+
 qtbase-opensource-src (5.5.1+dfsg-16ubuntu1) xenial; urgency=medium
 
   * Merge with Debian 5.5.1+dfsg-16.
diff --git a/debian/patches/qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch b/debian/patches/qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch
new file mode 100644
index 0000000..d27c465
--- /dev/null
+++ b/debian/patches/qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch
@@ -0,0 +1,49 @@
+From afdbf65a98792b6de5968fa3d1c2f8267af9d838 Mon Sep 17 00:00:00 2001
+From: Topi Reinio <topi.reinio at theqtcompany.com>
+Date: Thu, 19 Nov 2015 11:45:05 +0100
+Subject: [PATCH] qdoc: Wrap QML 'read-only' and 'default' qualifiers in
+ brackets
+
+The documentation for QML properties will be visually closer to
+that of C++ reference ([virtual] etc.). Also, this solves the
+issue in simplified CSS where there was no whitespace between
+the QML qualifier and the property name.
+
+Change-Id: Icebc72916ee06439b07b52550648912c9d57b080
+Task-number: QTBUG-49264
+Reviewed-by: Martin Smith <martin.smith at theqtcompany.com>
+---
+ src/tools/qdoc/htmlgenerator.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
+index b4a12b4..6d013de 100644
+--- a/src/tools/qdoc/htmlgenerator.cpp
++++ b/src/tools/qdoc/htmlgenerator.cpp
+@@ -4212,9 +4212,9 @@ void HtmlGenerator::generateDetailedQmlMember(Node *node,
+                 out() << "<a name=\"" + nodeRef + "\"></a>";
+ 
+                 if (!qpn->isWritable())
+-                    out() << "<span class=\"qmlreadonly\">read-only</span>";
++                    out() << "<span class=\"qmlreadonly\">[read-only] </span>";
+                 if (qpn->isDefault())
+-                    out() << "<span class=\"qmldefault\">default</span>";
++                    out() << "<span class=\"qmldefault\">[default] </span>";
+                 generateQmlItem(qpn, relative, marker, false);
+                 out() << "</p></td></tr>";
+             }
+@@ -4231,9 +4231,9 @@ void HtmlGenerator::generateDetailedQmlMember(Node *node,
+                 qpn->setReadOnly(!qpn->isWritable());
+         }
+         if (qpn->isReadOnly())
+-            out() << "<span class=\"qmlreadonly\">read-only</span>";
++            out() << "<span class=\"qmlreadonly\">[read-only] </span>";
+         if (qpn->isDefault())
+-            out() << "<span class=\"qmldefault\">default</span>";
++            out() << "<span class=\"qmldefault\">[default] </span>";
+         generateQmlItem(qpn, relative, marker, false);
+         out() << "</p></td></tr>";
+         out() << "</table></div>";
+-- 
+2.7.3
+
diff --git a/debian/patches/series b/debian/patches/series
index f4a5d53..8300e07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,6 +29,7 @@ xcb-Handle-screen-siblings-in-QXcbVirtualDesktop.patch
 xcb-Use-a-placeholder-QScreen-when-there-are-no-outp.patch
 dbusmenu_fixes.diff
 dbustray_fixes.diff
+qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging