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
..
moc	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
qdbuscpp2xml	Unify naming of LIBS/CFLAGS for 3rd party libraries	2016-04-07 16:18:03 +00:00
qdbusxml2cpp	Unify naming of LIBS/CFLAGS for 3rd party libraries	2016-04-07 16:18:03 +00:00
qmake	make extra compiler targets depend on their respective compiler	2016-04-18 09:38:10 +00:00
qmakelib	add $$sorted() function.	2016-05-25 06:19:16 +00:00
rcc	Updated license headers	2016-01-21 18:55:18 +00:00
uic	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-11 20:08:50 +01:00
tools.pro	add test for the qmake library	2015-02-25 13:54:33 +00:00