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
..
aix-g++
aix-g++-64
aix-xlc
aix-xlc-64
android-clang	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-25 14:41:29 +01:00
android-g++	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-11 07:40:32 +02:00
common	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
cygwin-g++
darwin-g++	Fix warning about headerpad_max_install_names ignored when using bitcode	2016-08-31 22:42:04 +00:00
devices	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
dummy	move all target spec handling to qmake-based configure system	2016-12-13 18:56:34 +00:00
features	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
freebsd-clang
freebsd-g++
haiku-g++	Clean up QT_QPA_DEFAULT_PLATFORM handling	2016-10-05 19:07:30 +00:00
hpux-acc
hpux-acc-64
hpux-acc-o64
hpux-g++
hpux-g++-64
hpuxi-acc-32
hpuxi-acc-64
hpuxi-g++-64
hurd-g++
integrity-armv7	Convert the old feature system	2016-09-15 08:24:10 +00:00
integrity-armv7-imx6	Convert the old feature system	2016-09-15 08:24:10 +00:00
integrity-x86	Convert the old feature system	2016-09-15 08:24:10 +00:00
irix-cc
irix-cc-64
irix-g++
irix-g++-64
linux-arm-gnueabi-g++
linux-clang
linux-clang-libc++
linux-cxx
linux-g++
linux-g++-32
linux-g++-64
linux-icc	Disable ICC warning 3373	2016-12-07 13:21:01 +00:00
linux-icc-32
linux-icc-64
linux-kcc
linux-llvm
linux-lsb-g++
linux-pgcc
lynxos-g++
macx-clang	Bump the minimum required Darwin versions	2017-01-03 23:04:36 +00:00
macx-g++	Bump the minimum required Darwin versions	2017-01-03 23:04:36 +00:00
macx-icc	Bump the minimum required Darwin versions	2017-01-03 23:04:36 +00:00
macx-ios-clang	Bump the minimum required Darwin versions	2017-01-03 23:04:36 +00:00
macx-tvos-clang	Bump the minimum required Darwin versions	2017-01-03 23:04:36 +00:00
macx-watchos-clang	Bump the minimum required Darwin versions	2017-01-03 23:04:36 +00:00
macx-xcode	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-25 16:12:11 +02:00
modules
netbsd-g++
openbsd-g++
qnx-aarch64le-qcc	Convert the old feature system	2016-09-15 08:24:10 +00:00
qnx-armle-v7-qcc	Convert the old feature system	2016-09-15 08:24:10 +00:00
qnx-x86-64-qcc	Convert the old feature system	2016-09-15 08:24:10 +00:00
qnx-x86-qcc	Convert the old feature system	2016-09-15 08:24:10 +00:00
sco-cc
sco-g++
solaris-cc
solaris-cc-64
solaris-cc-64-stlport
solaris-cc-stlport
solaris-g++
solaris-g++-64
tru64-cxx
tru64-g++
unixware-cc
unixware-g++
unsupported
win32-clang-msvc	Merge all "win32-msvc*" mkspecs into one	2016-12-23 13:45:39 +00:00
win32-g++	MinGW: reuse gcc-base.conf and g++-base.conf	2016-11-29 16:23:58 +00:00
win32-icc	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
win32-msvc	Merge all "win32-msvc*" mkspecs into one	2016-12-23 13:45:39 +00:00
winrt-arm-msvc2015	Remove hard-coded MS compiler versions from the mkspecs	2016-12-23 13:45:26 +00:00
winrt-x64-msvc2015	centralize QMAKE_COMPILER_DEFINES+=_WIN32 also for winrt specs	2016-12-30 10:25:11 +00:00
winrt-x64-msvc2017	winrt: Add support for Visual Studio 2017	2017-01-20 13:09:16 +00:00
winrt-x86-msvc2015	centralize QMAKE_COMPILER_DEFINES+=_WIN32 also for winrt specs	2016-12-30 10:25:11 +00:00
winrt-x86-msvc2017	winrt: Add support for Visual Studio 2017	2017-01-20 13:09:16 +00:00