Changes to 'dev/ubuntu_12.04'

Sat Dec 20 22:24:00 CET 2014

New branch 'dev/ubuntu_12.04' available with the following commits:
commit 932afe414ae871f8b9e9c353b384e725f2dc7b52
Author: Sandro KnauÃŸ <knauss at kolabsys.com>
Date:   Sat Dec 20 22:19:15 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"/>

commit 3d38e1eda7f55fc9a623b488729cf183757c5778
Author: Sandro KnauÃŸ <knauss at kolabsys.com>
Date:   Sat Dec 20 22:17:54 2014 +0100

    gcc4.6: needs friend class declaration