Liang Qi 511790fd1a Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: config_help.txt configure mkspecs/features/uikit/sdk.prf src/corelib/global/qhooks.cpp src/corelib/io/qfilesystemwatcher.cpp src/corelib/io/qlockfile_unix.cpp src/corelib/tools/qalgorithms.h src/gui/kernel/qwindowsysteminterface.h src/gui/text/qtextdocument_p.cpp src/network/access/access.pri src/network/access/qnetworkaccessmanager.cpp src/network/access/qnetworkreplynsurlconnectionimpl.mm src/src.pro src/testlib/qtestcase.cpp src/widgets/kernel/qwidgetbackingstore_p.h src/widgets/styles/qwindowscestyle.cpp src/widgets/styles/qwindowsmobilestyle.cpp tests/auto/corelib/io/qdiriterator/qdiriterator.pro tests/auto/corelib/io/qfileinfo/qfileinfo.pro tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp tools/configure/configureapp.cpp Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67		2016-06-13 12:46:46 +02:00
..
configure_pch.h	Updated license headers	2016-01-21 18:55:18 +00:00
configure.pro	tools/configure: enable QStringBuilder	2016-04-08 12:24:07 +00:00
configureapp.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
configureapp.h	Updated license headers	2016-01-21 18:55:18 +00:00
environment.cpp	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
environment.h	Updated license headers	2016-01-21 18:55:18 +00:00
main.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
Makefile.mingw	tools/configure: enable QStringBuilder	2016-04-08 12:24:07 +00:00
Makefile.win32	tools/configure: enable QStringBuilder	2016-04-08 12:24:07 +00:00
tools.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
tools.h	Updated license headers	2016-01-21 18:55:18 +00:00