Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 29 Apr 2010 07:54:44 +0000 (09:54 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 29 Apr 2010 07:54:44 +0000 (09:54 +0200)
commitdcaad8949ea1c1782d27b038f08e9a728c8e3fe5
tree3cb49a22f79c5952de4e913146659990d614cd64
parent917e4e3284a568eecfca26365cc0a545d0f4eb70
parent6940070adb45d67a0a9186205a4914a0a6c14135
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

All EGL-related changes from 4.6 were discarded.

Conflicts:
src/gui/egl/egl.pri
src/gui/egl/qegl.cpp
src/gui/egl/qegl_p.h
src/gui/egl/qegl_stub.cpp
src/gui/egl/qeglproperties_p.h
src/gui/egl/qeglproperties_stub.cpp
src/gui/gui.pro
src/multimedia/multimedia/audio/qaudioinput_win32_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
21 files changed:
src/corelib/global/qglobal.cpp
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/corelib/kernel/qeventdispatcher_symbian_p.h
src/corelib/tools/qbytedata_p.h
src/gui/kernel/qapplication_s60.cpp
src/gui/text/qfont.cpp
src/gui/text/qfontdatabase_s60.cpp
src/gui/widgets/qlineedit.cpp
src/multimedia/multimedia/audio/qaudioinput_alsa_p.cpp
src/multimedia/multimedia/audio/qaudioinput_win32_p.cpp
src/multimedia/multimedia/audio/qaudioinput_win32_p.h
src/multimedia/multimedia/audio/qaudiooutput_alsa_p.cpp
src/multimedia/multimedia/audio/qaudiooutput_win32_p.cpp
src/multimedia/multimedia/audio/qaudiooutput_win32_p.h
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/access/qnetworkaccesshttpbackend.cpp
src/network/access/qnetworkreplyimpl.cpp
src/network/access/qnetworkreplyimpl_p.h
src/opengl/qgl.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/auto/selftests/tst_selftests.cpp