Liang Qi 56d6e000f7 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: mkspecs/wince80colibri-armv7-msvc2012/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/corelib/global/qnamespace.h src/corelib/global/qnamespace.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/tools/tools.pri src/network/ssl/qsslconfiguration_p.h src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/plugins/platforms/windows/windows.pri src/src.pro src/tools/bootstrap/bootstrap.pro src/tools/uic/cpp/cppwriteinitialization.cpp src/widgets/dialogs/qfilesystemmodel.cpp tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt Change-Id: I4d2ac78f0dcc97f008186bbbc769c6fe588ab0e5		2016-05-23 21:09:46 +02:00
..
task71021	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
Test.framework/Headers	Updated license headers	2016-01-21 18:55:18 +00:00
testproject	Updated license headers	2016-01-21 18:55:18 +00:00
.gitattributes	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
.gitignore	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
assign-namespace.h	Updated license headers	2016-01-21 18:55:18 +00:00
backslash-newlines.h	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
c-comments.h	Updated license headers	2016-01-21 18:55:18 +00:00
cstyle-enums.h	Updated license headers	2016-01-21 18:55:18 +00:00
cxx11-enums.h	Updated license headers	2016-01-21 18:55:18 +00:00
cxx11-explicit-override-control.h	Updated license headers	2016-01-21 18:55:18 +00:00
cxx11-final-classes.h	Updated license headers	2016-01-21 18:55:18 +00:00
dir-in-include-path.h	Updated license headers	2016-01-21 18:55:18 +00:00
dollars.h	Updated license headers	2016-01-21 18:55:18 +00:00
error-on-wrong-notify.h	Updated license headers	2016-01-21 18:55:18 +00:00
escapes-in-string-literals.h	Updated license headers	2016-01-21 18:55:18 +00:00
extraqualification.h	Updated license headers	2016-01-21 18:55:18 +00:00
forgotten-qinterface.h	Updated license headers	2016-01-21 18:55:18 +00:00
forward-declared-param.h	Update the Intel copyright year	2016-01-21 22:44:16 +00:00
function-with-attributes.h	Updated license headers	2016-01-21 18:55:18 +00:00
gadgetwithnoenums.h	Updated license headers	2016-01-21 18:55:18 +00:00
grand-parent-gadget-class.h	Updated license headers	2016-01-21 18:55:18 +00:00
Header	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
interface-from-framework.h	Updated license headers	2016-01-21 18:55:18 +00:00
interface-from-include.h	Updated license headers	2016-01-21 18:55:18 +00:00
macro-on-cmdline.h	Updated license headers	2016-01-21 18:55:18 +00:00
moc.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
namespaced-flags.h	Updated license headers	2016-01-21 18:55:18 +00:00
no-keywords.h	Updated license headers	2016-01-21 18:55:18 +00:00
non-gadget-parent-class.h	Updated license headers	2016-01-21 18:55:18 +00:00
oldstyle-casts.h	Updated license headers	2016-01-21 18:55:18 +00:00
os9-newlines.h	Updated license headers	2016-01-21 18:55:18 +00:00
parse-boost.h	Updated license headers	2016-01-21 18:55:18 +00:00
parse-defines.h	Updated license headers	2016-01-21 18:55:18 +00:00
plugin_metadata.h	Updated license headers	2016-01-21 18:55:18 +00:00
pp-dollar-signs.h	Updated license headers	2016-01-21 18:55:18 +00:00
pure-virtual-signals.h	Updated license headers	2016-01-21 18:55:18 +00:00
qinvokable.h	Updated license headers	2016-01-21 18:55:18 +00:00
qprivateslots.h	Updated license headers	2016-01-21 18:55:18 +00:00
qtbug-35657-gadget.h	Updated license headers	2016-01-21 18:55:18 +00:00
related-metaobjects-in-gadget.h	Updated license headers	2016-01-21 18:55:18 +00:00
related-metaobjects-in-namespaces.h	Updated license headers	2016-01-21 18:55:18 +00:00
related-metaobjects-name-conflict.h	Updated license headers	2016-01-21 18:55:18 +00:00
single_function_keyword.h	Updated license headers	2016-01-21 18:55:18 +00:00
single-quote-digit-separator-n3781.h	Updated license headers	2016-01-21 18:55:18 +00:00
slots-with-void-template.h	Updated license headers	2016-01-21 18:55:18 +00:00
task87883.h	Updated license headers	2016-01-21 18:55:18 +00:00
task189996.h	Updated license headers	2016-01-21 18:55:18 +00:00
task192552.h	Updated license headers	2016-01-21 18:55:18 +00:00
task234909.h	Updated license headers	2016-01-21 18:55:18 +00:00
task240368.h	Updated license headers	2016-01-21 18:55:18 +00:00
template-gtgt.h	Updated license headers	2016-01-21 18:55:18 +00:00
trigraphs.h	Updated license headers	2016-01-21 18:55:18 +00:00
tst_moc.cpp	tst_moc: Remove invalid preprocessor usage	2016-05-04 16:44:30 +00:00
unterminated-function-macro.h	Updated license headers	2016-01-21 18:55:18 +00:00
using-namespaces.h	Updated license headers	2016-01-21 18:55:18 +00:00
warn-on-multiple-qobject-subclasses.h	Updated license headers	2016-01-21 18:55:18 +00:00
warn-on-property-without-read.h	Updated license headers	2016-01-21 18:55:18 +00:00
win-newlines.h	Updated license headers	2016-01-21 18:55:18 +00:00