Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 26 Aug 2010 09:31:27 +0000 (11:31 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 26 Aug 2010 09:31:27 +0000 (11:31 +0200)
commit69354f37173b7bfcf7ea0f37175a34b8766afcbb
treed5d35fbb1c5b93470b6b1aa03c359ac09695055f
parent065610d14fda00057724a46e2649db6bb98aca58
parente5aa5a9d7e97b975316b8cc18554743cccf06474
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
bin/syncqt
src/opengl/qgl.cpp
tools/configure/configureapp.cpp
qmake/generators/win32/winmakefile.cpp
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/opengl/qgl_win.cpp
src/opengl/qglshaderprogram.cpp
src/sql/drivers/odbc/qsql_odbc.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tools/configure/configure.pro
tools/configure/configureapp.cpp
tools/configure/environment.cpp