Liang Qi 38c1057f69 Merge remote-tracking branch 'origin/5.6' into 5.7 ... This also reverts commit 0d2f0164f4. Conflicts: header.BSD-NEW qmake/Makefile.win32 src/openglextensions/qopenglextensions.cpp src/openglextensions/qopenglextensions.h src/winmain/qtmain_win.cpp src/winmain/qtmain_winrt.cpp tools/configure/configureapp.cpp util/glgen/qopenglextensions.cpp.header util/glgen/qopenglextensions.h.header Change-Id: If26c6f4111b342378dd88bbdc657e322d2ab6ad8		2016-11-23 09:24:36 +01:00
..
images	Doc: Fixed qmake manual's images and snippets directories.	2013-08-13 01:38:54 +02:00
snippets	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-20 08:00:26 +02:00
src	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-23 09:24:36 +01:00
qmake.qdocconf	Doc: add navigation info to qmake Manual	2014-12-01 20:04:00 +01:00