Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 13 Apr 2010 12:05:58 +0000 (14:05 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 13 Apr 2010 12:05:58 +0000 (14:05 +0200)
commit235bdeea52059010ef2e92058adb1213161b0956
treebcf24441076d47835cdd4dce90f71c43cc9d020c
parent3e94b3a77affeef80544e48949e018ced4e0d96e
parent8e6b240eef98060737324e33b09f4323ced58213
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
mkspecs/aix-xlc-64/qmake.conf
mkspecs/aix-xlc/qmake.conf
src/corelib/io/qprocess.cpp
src/gui/image/qpixmap_x11.cpp
src/network/access/qnetworkaccessmanager.cpp
src/network/socket/qnativesocketengine_unix.cpp
src/network/ssl/qsslsocket.cpp
tools/tools.pro