← Back to branch summary

~ubuntu-branches/ubuntu/raring/qtscriptgenerator/raring

« back to all changes in this revision

Viewing changes to debian/patches/upstream_arm_fix_ftbfs.diff

  • Committer: Bazaar Package Importer
  • Author(s): Modestas Vainius
  • Date: 2011-04-24 16:39:27 UTC
  • mfrom: (3.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110424163927-i4ecxee3juiq8d4e
Tags: 0.1.0+git20101026+8b191fbc-2
* debian_simple_top_makefile.diff: make generated_cpp depend on typesystem
  xml files.
* Add upstream_arm_fix_ftbfs.diff patch to fix FTBFS on arm* architectures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/upstream_arm_fix_ftbfs.diff
 
1
From: Modestas Vainius <modax@debian.org>
 
2
Subject: Fix FBTFS on arm*
 
3
Last-Update: 2011-04-24
 
4
Forwarded: no
 
5
 
 
6
generator gets the signature of QEasingCurve::setCustomType() wrong. What is
 
7
more, qreal is involved in the signature. qreal is float on arm* so exclude
 
8
setCustomType(float) methods as well.
 
9
 
 
10
--- a/generator/typesystem_core-common.xml
 
11
+++ b/generator/typesystem_core-common.xml
 
12
@@ -921,6 +921,7 @@
 
13
   <value-type name="QEasingCurve">
 
14
     <modify-function signature="customType()const" remove="all" />
 
15
     <modify-function signature="setCustomType(double)" remove="all" />
 
16
+    <modify-function signature="setCustomType(float)" remove="all" />
 
17
   </value-type>
 
18
 
 
19
   <object-type name="QAbstractAnimation" />
 
20
--- a/generator/typesystem_core.xml
 
21
+++ b/generator/typesystem_core.xml
 
22
@@ -1388,14 +1388,12 @@
 
23
   </value-type>
 
24
 
 
25
   <value-type name="QEasingCurve">
 
26
-    <modify-function signature="customType()const" remove="all"/>
 
27
-    <modify-function signature="setCustomType(double)" remove="all"/>
 
28
-  
 
29
     <modify-function signature="QEasingCurve(QEasingCurve)" remove="all"/>
 
30
     <modify-function signature="operator=(QEasingCurve)" remove="all"/>
 
31
     <modify-function signature="operator==(const QEasingCurve &amp;)const" remove="all"/>
 
32
     <modify-function signature="operator!=(const QEasingCurve &amp;)const" remove="all"/>
 
33
     <modify-function signature="setCustomType(double)" remove="all"/>
 
34
+    <modify-function signature="setCustomType(float)" remove="all"/>
 
35
     <modify-function signature="customType()const" remove="all"/>
 
36
   </value-type>
 
37
 
 
38
--- a/generator/typesystem_core-qtscript.xml
 
39
+++ b/generator/typesystem_core-qtscript.xml
 
40
@@ -1447,6 +1447,7 @@
 
41
     <modify-function signature="operator==(const QEasingCurve &amp;)const" remove="all"/>
 
42
     <modify-function signature="operator!=(const QEasingCurve &amp;)const" remove="all"/>
 
43
     <modify-function signature="setCustomType(double)" remove="all"/>
 
44
+    <modify-function signature="setCustomType(float)" remove="all"/>
 
45
     <modify-function signature="customType()const" remove="all"/>
 
46
   </value-type>
 
47