Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: doc/global/qt-cpp-defines.qdocconf src/3rdparty/forkfd/forkfd.c src/corelib/codecs/qtextcodec.cpp src/corelib/kernel/qmetatype.cpp src/corelib/tools/qset.qdoc src/gui/accessible/qaccessible.cpp src/gui/image/qpixmapcache.cpp src/opengl/qgl.cpp src/tools/qdoc/generator.cpp src/widgets/kernel/qwidget.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085		2015-08-06 10:54:01 +02:00
..
images	Doc: Fixed qmake manual's images and snippets directories.	2013-08-13 01:38:54 +02:00
snippets	deprecate DEPLOYMENT variable	2015-06-02 09:59:32 +00:00
src	Merge remote-tracking branch 'origin/5.5' into dev	2015-08-06 10:54:01 +02:00
qmake.qdocconf	Doc: add navigation info to qmake Manual	2014-12-01 20:04:00 +01:00