Frederik Gladhorn c608ec8254 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/io/qsavefile_p.h src/corelib/tools/qregularexpression.cpp src/gui/util/qvalidator.cpp src/gui/util/qvalidator.h Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825		2013-01-22 18:40:13 +01:00
..
convertFromImage	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
convertFromToHICON	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
images	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
loadFromData	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qpixmap.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
qpixmap.qrc	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
tst_qpixmap.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00