318b58562a
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 |
||
---|---|---|
.. | ||
common | ||
freebsd-generic-clang | ||
freebsd-rasp-pi-clang | ||
linux-archos-gen8-g++ | ||
linux-arm-amlogic-8726M-g++ | ||
linux-arm-generic-g++ | ||
linux-arm-hisilicon-hix5hd2-g++ | ||
linux-arm-trident-pnx8473-g++ | ||
linux-beagleboard-g++ | ||
linux-colibri-vf-g++ | ||
linux-drive-cx-g++ | ||
linux-emu-g++ | ||
linux-generic-g++ | ||
linux-imx6-g++ | ||
linux-imx7-g++ | ||
linux-imx53qsb-g++ | ||
linux-jetson-tk1-g++ | ||
linux-jetson-tk1-pro-g++ | ||
linux-jetson-tx1-g++ | ||
linux-mipsel-broadcom-97425-g++ | ||
linux-mipsel-ci20-g++ | ||
linux-nuc-g++ | ||
linux-odroid-xu3-g++ | ||
linux-rasp-pi2-g++ | ||
linux-rasp-pi3-g++ | ||
linux-rasp-pi3-vc4-g++ | ||
linux-rasp-pi-g++ | ||
linux-rcar-h2-g++ | ||
linux-sh4-stmicro-ST7108-g++ | ||
linux-sh4-stmicro-ST7540-g++ | ||
linux-snowball-g++ | ||
linux-tegra2-g++ |