a1ad9a74eb
Conflicts: src/corelib/io/io.pri src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/network/socket/qabstractsocket.cpp src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h src/widgets/styles/qgtkstyle.cpp tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro tests/auto/dbus/qdbusconnection/qdbusconnection.pro tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7 |
||
---|---|---|
.. | ||
common | ||
linux-archos-gen8-g++ | ||
linux-arm-amlogic-8726M-g++ | ||
linux-arm-hisilicon-hix5hd2-g++ | ||
linux-arm-trident-pnx8473-g++ | ||
linux-beagleboard-g++ | ||
linux-imx6-g++ | ||
linux-imx53qsb-g++ | ||
linux-mipsel-broadcom-97425-g++ | ||
linux-nuc-g++ | ||
linux-odroid-xu3-g++ | ||
linux-rasp-pi2-g++ | ||
linux-rasp-pi-g++ | ||
linux-sh4-stmicro-ST7108-g++ | ||
linux-sh4-stmicro-ST7540-g++ | ||
linux-snowball-g++ | ||
linux-tegra2-g++ |