Merge master into api_changes
authorKent Hansen <kent.hansen@nokia.com>
Mon, 19 Mar 2012 09:03:48 +0000 (10:03 +0100)
committerKent Hansen <kent.hansen@nokia.com>
Mon, 19 Mar 2012 09:03:48 +0000 (10:03 +0100)
commit95d6f8a4cf3fba2fd675f0e6b5de0ce1d702da26
treea0bb36e478c97761afa36baf8026726b3d2fdbc8
parent3f64a7b67bfbcaab65ebb03f84962cce5834790b
parent25e004bfe493e18be255b057ae5c132a5ec5458b
Merge master into api_changes

Conflicts:
src/corelib/tools/qvector.h
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp

Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6
19 files changed:
dist/changes-5.0.0
qmake/Makefile.win32
src/corelib/tools/qbytearray.cpp
src/corelib/tools/qbytearray.h
src/corelib/tools/qhash.cpp
src/corelib/tools/qhash.h
src/corelib/tools/qlinkedlist.cpp
src/corelib/tools/qlinkedlist.h
src/corelib/tools/qlist.cpp
src/corelib/tools/qlist.h
src/corelib/tools/qmap.cpp
src/corelib/tools/qmap.h
src/corelib/tools/qstring.cpp
src/corelib/tools/qstring.h
src/corelib/tools/qvector.cpp
src/corelib/tools/qvector.h
src/gui/kernel/qwindowsysteminterface_qpa.h
src/testlib/qtestcase.cpp
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp