AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90c425642d
qt5base-lts/tests/auto/gui/image/qpixmap
History
Liang Qi 90c425642d Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	mkspecs/common/linux-android.conf
	src/gui/opengl/qopengl.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/network/socket/qnativesocketengine_winrt_p.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	sync.profile

Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4
2016-11-16 12:35:36 +01:00
..
convertFromImage Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
convertFromToHICON Purge sRGB chunks from PNGs in tests. 2016-03-29 08:39:43 +00:00
images Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
loadFromData Purge sRGB chunks from PNGs in tests. 2016-03-29 08:39:43 +00:00
.gitignore Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
qpixmap.pro QtGui: Remove Windows CE. 2016-03-30 17:35:41 +00:00
qpixmap.qrc Android: Fix qpixmap test. 2015-01-08 10:10:50 +01:00
tst_qpixmap.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-16 12:35:36 +01:00