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
..
moc	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-23 21:09: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	Updated license headers	2016-01-21 18:55:18 +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