Merge remote-tracking branch 'origin/api_changes'
authorLars Knoll <lars.knoll@nokia.com>
Sun, 4 Mar 2012 20:32:40 +0000 (21:32 +0100)
committerLars Knoll <lars.knoll@nokia.com>
Sun, 4 Mar 2012 20:45:05 +0000 (21:45 +0100)
commit96232be1466e8c059c270b611ce7c32997ff60a9
tree9bf47c0c2c84556415eee7f938a098ae7e542649
parent8db8a34f07a2f8cbd06dc0b593886a13d52ae4b1
parentfb8c95bac09910c4dfa476ab97c6206b2e94ee53
Merge remote-tracking branch 'origin/api_changes'

Conflicts:
dist/changes-5.0.0
mkspecs/features/qt_module_config.prf
qmake/project.cpp
qmake/property.cpp

Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296
31 files changed:
configure
dist/changes-5.0.0
mkspecs/features/default_pre.prf
mkspecs/features/qt_module_config.prf
qmake/generators/mac/pbuilder_pbx.cpp
qmake/generators/makefile.cpp
qmake/option.cpp
qmake/option.h
qmake/project.cpp
qmake/property.cpp
src/corelib/codecs/qtextcodec.cpp
src/corelib/io/qsettings.cpp
src/corelib/json/qjsonarray.cpp
src/corelib/json/qjsonobject.cpp
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/corelib/kernel/qobjectdefs.h
src/corelib/kernel/qvariant.cpp
src/corelib/tools/qbytearray.cpp
src/corelib/tools/qpair.h
src/corelib/tools/qstring.cpp
src/gui/image/qimage.cpp
src/gui/image/qpixmap.cpp
src/gui/kernel/qpalette.cpp
src/gui/text/qfontengine_p.h
src/gui/text/qtextcursor.cpp
src/widgets/kernel/qicon.cpp
src/xml/dom/qdom.cpp
src/xml/sax/qxml.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
tools/configure/configureapp.cpp