818014b449
Conflicts: configure src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp src/network/access/qnetworkaccessmanager.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h src/widgets/widgets/qlineedit_p.cpp src/widgets/widgets/qlineedit_p.h src/winmain/winmain.pro tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp tools/configure/configureapp.cpp Change-Id: Ib9997b0d0f91946e4081d36c0c6b696c5c983b2a |
||
---|---|---|
.. | ||
common | ||
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-drive-cx-g++ | ||
linux-imx6-g++ | ||
linux-imx7-g++ | ||
linux-imx53qsb-g++ | ||
linux-jetson-tk1-g++ | ||
linux-jetson-tk1-pro-g++ | ||
linux-mipsel-broadcom-97425-g++ | ||
linux-nuc-g++ | ||
linux-odroid-xu3-g++ | ||
linux-rasp-pi2-g++ | ||
linux-rasp-pi-g++ | ||
linux-rpi3-g++ | ||
linux-sh4-stmicro-ST7108-g++ | ||
linux-sh4-stmicro-ST7540-g++ | ||
linux-snowball-g++ | ||
linux-tegra2-g++ |