Merge master -> api_changes
authorRohan McGovern <rohan.mcgovern@nokia.com>
Tue, 28 Feb 2012 23:18:59 +0000 (09:18 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Tue, 28 Feb 2012 23:23:14 +0000 (09:23 +1000)
commit98dd1781d9256f68025d2a2db408f4f5947f3214
treedbe1424abd90014edb5546c920ca585ed62b46e3
parent6c1bdc1854a7700c2b3a345b95f6a2fdca84037d
parentfa1b9070af66edb81b2a3735c1951f78b22bd666
Merge master -> api_changes

Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.

Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
12 files changed:
mkspecs/features/qt.prf
qmake/project.cpp
src/corelib/codecs/qtextcodec.cpp
src/corelib/global/qglobal.h
src/corelib/kernel/qobjectdefs.h
src/corelib/kernel/qvariant.cpp
src/corelib/tools/qstring.cpp
src/corelib/tools/qstring.h
src/tools/rcc/rcc.cpp
src/widgets/kernel/qicon.cpp
src/xml/dom/qdom.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp