Frederik Gladhorn e65cd6f379 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629		2013-02-14 14:24:57 +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-02-14 14:24:57 +01:00