Merge "Merge remote-tracking branch 'origin/containers' into api_changes" into refs...
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Fri, 9 Mar 2012 10:04:36 +0000 (11:04 +0100)
committerQt by Nokia <qt-info@nokia.com>
Fri, 9 Mar 2012 11:32:30 +0000 (12:32 +0100)
commit152eec7aa42cf688619beee5792838ce6dd5c7eb
tree192ebbe4fc6f87dbaa3f0cab7efc4443d826e10c
parent86abc878832db67da87b9fe34faa4bc8d71446b0
parent08a993526eb1d98e0e22c6d4ae08d0cf2a587e49
Merge "Merge remote-tracking branch 'origin/containers' into api_changes" into refs/staging/api_changes
src/corelib/kernel/qvariant_p.h