Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master

author Lars Knoll <lars.knoll@nokia.com>

Thu, 3 May 2012 13:43:10 +0000 (15:43 +0200)

committer Qt by Nokia <qt-info@nokia.com>

Thu, 3 May 2012 14:11:58 +0000 (16:11 +0200)
author Lars Knoll <lars.knoll@nokia.com>
Thu, 3 May 2012 13:43:10 +0000 (15:43 +0200)
committer Qt by Nokia <qt-info@nokia.com>
Thu, 3 May 2012 14:11:58 +0000 (16:11 +0200)
diff --cc src/corelib/kernel/qvariant.cpp
Simple merge
diff --cc src/corelib/tools/qstring.cpp
Simple merge
diff --cc src/corelib/tools/qstring.h
Simple merge
author	Lars Knoll <lars.knoll@nokia.com>
	Thu, 3 May 2012 13:43:10 +0000 (15:43 +0200)
committer	Qt by Nokia <qt-info@nokia.com>
	Thu, 3 May 2012 14:11:58 +0000 (16:11 +0200)
		1	2
src/corelib/kernel/qvariant.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstring.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstring.h	patch \|	diff1 \|	diff2 \|	blob \| history