Include joined fields when merging QgsFields

m-kuhn · m-kuhn · commit 449c2a23dc9b · 2013-06-16T15:10:34.000+02:00
diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h
@@ -190,8 +190,7 @@ class CORE_EXPORT QgsFields
     {
       for ( int i = 0; i < other.count(); ++i )
       {
-        if ( other.fieldOrigin( i ) != OriginJoin )
-          append( other.at( i ), other.fieldOrigin( i ), other.fieldOriginIndex( i ) );
+        append( other.at( i ), other.fieldOrigin( i ), other.fieldOriginIndex( i ) );
       }
     }
     inline const QgsField& operator[]( int i ) const { return mFields[i].field; }

Original file line number	Diff line number	Diff line change
`@@ -190,8 +190,7 @@ class CORE_EXPORT QgsFields`
`190`	`190`	`{`
`191`	`191`	`for ( int i = 0; i < other.count(); ++i )`
`192`	`192`	`{`
`193`		`- if ( other.fieldOrigin( i ) != OriginJoin )`
`194`		`- append( other.at( i ), other.fieldOrigin( i ), other.fieldOriginIndex( i ) );`
	`193`	`+ append( other.at( i ), other.fieldOrigin( i ), other.fieldOriginIndex( i ) );`
`195`	`194`	`}`
`196`	`195`	`}`
`197`	`196`	`inline const QgsField& operator[]( int i ) const { return mFields[i].field; }`