Liang Qi 1fadc7292b Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/plugins/platforms/windows/qwindowsfontengine.cpp src/plugins/platforms/windows/qwindowsnativeimage.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I649b32b260ce0ed2d6a5089021daa0d6a8db85f7		2016-02-24 13:31:14 +01:00
..
mac	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-24 13:31:14 +01:00
unix	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
win32	qmake: remove some empty user-defined dtors	2016-02-15 14:45:40 +00:00
makefile.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
makefile.h	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
makefiledeps.cpp	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
makefiledeps.h	Updated license headers	2016-01-21 18:55:18 +00:00
metamakefile.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
metamakefile.h	Updated license headers	2016-01-21 18:55:18 +00:00
projectgenerator.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
projectgenerator.h	Updated license headers	2016-01-21 18:55:18 +00:00
xmloutput.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
xmloutput.h	Updated license headers	2016-01-21 18:55:18 +00:00