Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
authorLars Knoll <lars.knoll@nokia.com>
Thu, 3 May 2012 13:43:10 +0000 (15:43 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 3 May 2012 14:11:58 +0000 (16:11 +0200)
commit6dac3f18941bd2d66218ec43f08e4fb9be869c63
treef2664c9f31d5046f38a1403f46eb0fc162d5242c
parentb4dabb9e50ce26469b0b7d71e168463abf727334
parent1e49914fee099c4c0d634743326b50ad02e6c8f1
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
src/corelib/kernel/qvariant.cpp
src/corelib/tools/qstring.cpp
src/corelib/tools/qstring.h