Branch 'kolab/integration/4.13.0' - akonadi/kcfg2dbus.xsl

[Christian Mollekopf]

 akonadi/kcfg2dbus.xsl |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit a4435a3ccf5f3f1f985f951d21294c560d9a6b86
Author: Sandro Knauß <knauss at kolabsys.com>
Date:   Sat Dec 20 22:29:22 2014 +0100

    qt4.8: annotation namespace changed
    
    The annotation namespace changes woth newer qt versions:
    old:
    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QDate"/>
    new:
    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QDate"/>

diff --git a/akonadi/kcfg2dbus.xsl b/akonadi/kcfg2dbus.xsl
index 9c09c0b..f851e9c 100644
--- a/akonadi/kcfg2dbus.xsl
+++ b/akonadi/kcfg2dbus.xsl
@@ -43,6 +43,9 @@
         <annotation name="org.qtproject.QtDBus.QtTypeName.Out0">
         <xsl:attribute name="value"><xsl:value-of select="$annotation"/></xsl:attribute>
         </annotation>
+        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0">
+        <xsl:attribute name="value"><xsl:value-of select="$annotation"/></xsl:attribute>
+        </annotation>
       </xsl:if>
     </method>
     <method>
@@ -56,6 +59,9 @@
         <annotation name="org.qtproject.QtDBus.QtTypeName.In0">
         <xsl:attribute name="value"><xsl:value-of select="$annotation"/></xsl:attribute>
         </annotation>
+        <annotation name="com.trolltech.QtDBus.QtTypeName.In0">
+        <xsl:attribute name="value"><xsl:value-of select="$annotation"/></xsl:attribute>
+        </annotation>
       </xsl:if>
     </method>
   </xsl:for-each>