main tree merge 4.6-iphone
authorMark Kromis <greybird@AtomicDeath.local>
Fri, 16 Apr 2010 05:46:39 +0000 (01:46 -0400)
committerMark Kromis <greybird@AtomicDeath.local>
Fri, 16 Apr 2010 05:46:39 +0000 (01:46 -0400)
commite974e8ef64bb737bd6038a658a39047581707088
tree8cdcc1ab43e6301d7726075b1a3893c8f236ce0d
parentc598a7d31575d37cf934a53a33faf01b5899a3cc
parent0dbd8f1b0a6df20e5502bb35e58490a9f99953a7
main tree merge
46 files changed:
doc/src/platforms/platform-notes.qdoc
mkspecs/aix-xlc-64/qmake.conf
mkspecs/aix-xlc/qmake.conf
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
qmake/generators/symbian/symmake.h
qmake/generators/symbian/symmake_sbsv2.cpp
qmake/qmake.pri
src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp
src/corelib/codecs/qtextcodec.cpp
src/corelib/codecs/qtextcodec.h
src/corelib/io/qprocess.cpp
src/corelib/kernel/qcoreapplication.cpp
src/gui/graphicsview/qgraphicswidget.cpp
src/gui/image/qimage.cpp
src/gui/image/qpixmap_x11.cpp
src/gui/itemviews/qtableview.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qsoftkeymanager_s60.cpp
src/gui/kernel/qwidget.cpp
src/gui/styles/qs60style_s60.cpp
src/gui/text/qfont.cpp
src/gui/text/qtextcontrol.cpp
src/gui/text/qtextengine.cpp
src/gui/widgets/qmenu.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioinput_win32_p.cpp
src/multimedia/audio/qaudiooutput_win32_p.cpp
src/multimedia/audio/qaudiooutput_win32_p.h
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/access/qnetworkaccessmanager.cpp
src/network/socket/qnativesocketengine_unix.cpp
src/network/ssl/qsslsocket.cpp
src/network/ssl/qsslsocket_openssl_symbols.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
src/openvg/qwindowsurface_vgegl.cpp
src/script/api/qscriptengine.cpp
src/script/api/qscriptvalue.cpp
tests/auto/qfile/tst_qfile.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
tests/auto/qtcpsocket/tst_qtcpsocket.cpp
tools/tools.pro