qt5base-lts/tests/auto/gui/image/qimage
Frederik Gladhorn a09a8d509a Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/plugins/platforms/android/androidjniaccessibility.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp

Manually adjusted:
	mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
	to include 9ce697f2d5

Thanks goes to Sergio for the qnx mkspecs adjustments.

Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e
2014-07-01 16:25:19 +02:00
..
images Moving tiff image format support and libtiff out of qtbase 2012-01-31 14:31:04 +01:00
.gitignore Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
qimage.pro Inplace versions of QImage rgbSwapped() and mirrored() for rvalue refs 2014-01-08 18:08:47 +01:00
tst_qimage.cpp Merge remote-tracking branch 'origin/5.3' into dev 2014-07-01 16:25:19 +02:00