Liang Qi 318b58562a Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/common/msvc-version.conf mkspecs/common/winrt_winphone/qmake.conf mkspecs/features/mac/default_post.prf mkspecs/features/mac/sdk.prf mkspecs/features/qt.prf mkspecs/features/uikit/default_post.prf mkspecs/features/winrt/default_pre.prf mkspecs/winphone-arm-msvc2013/qmake.conf mkspecs/winphone-x86-msvc2013/qmake.conf mkspecs/winrt-arm-msvc2013/qmake.conf mkspecs/winrt-x64-msvc2013/qmake.conf mkspecs/winrt-x86-msvc2013/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/gui/kernel/qwindowsysteminterface.cpp src/network/kernel/qhostaddress.cpp src/plugins/platforms/mirclient/qmirclientplugin.cpp src/plugins/platforms/mirclient/qmirclientplugin.h src/widgets/util/qsystemtrayicon.cpp tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp tools/configure/Makefile.mingw tools/configure/Makefile.win32 Done-with: Jake Petroules <jake.petroules@qt.io> Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe		2017-01-25 20:06:06 +01:00
..
arch	PowerPC: Add detection of SPE (found on e500) and VSX	2016-06-19 18:46:26 +00:00
common	move device spec validation to configure	2016-12-13 18:55:52 +00:00
mac/corewlan	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
qpa	Add eglfs-viv support for INTEGRITY	2017-01-18 13:04:38 +00:00
unix	PCRE2: port QRegularExpression to PCRE2	2016-12-12 15:22:01 +00:00
win	determine compiler version at build time, not in configure	2016-12-23 13:44:50 +00:00
x11	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.qmake.conf	make also configure tests not see %LIB% and %INCLUDE% under mingw	2016-10-17 13:44:43 +00:00