Merge remote branch 'qt/4.8' into 4.8 4.8
authorwang-bin <wbsecg1@gmail.com>
Tue, 17 Apr 2012 02:19:41 +0000 (10:19 +0800)
committerwang-bin <wbsecg1@gmail.com>
Tue, 17 Apr 2012 02:19:41 +0000 (10:19 +0800)
commit3a9627a9b40128784adb82ce0c42689dc8536481
treedb57a792c2f98e570d0379ccdb052bd3a2dc6f79
parente878c530ad44c5200522c48844bd32b26239bcb1
parent1d95d8b608d5f689afd3c40535ab67ffabb343e9
Merge remote branch 'qt/4.8' into 4.8
src/3rdparty/libpng/pngpriv.h
src/corelib/global/qglobal.h
src/gui/kernel/qwidget.cpp