Liang Qi 790aef362f Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: .qmake.conf configure src/corelib/global/qglobal.h src/tools/qdoc/node.cpp src/tools/qdoc/qdocdatabase.cpp tests/auto/corelib/io/qsettings/tst_qsettings.cpp tools/configure/configureapp.cpp Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f		2015-10-23 14:45:03 +02:00
..
configure	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-23 14:45:03 +02:00
shared/windows	Update copyright headers	2015-02-11 06:49:51 +00:00