9033977d39
Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5 |
||
---|---|---|
.. | ||
blackberry-playbook-armle-v7-qcc | ||
blackberry-playbook-armv7le-qcc | ||
blackberry-playbook-x86-qcc | ||
common | ||
linux-archos-gen8-g++ | ||
linux-arm-amlogic-8726M-g++ | ||
linux-arm-trident-pnx8473-g++ | ||
linux-beagleboard-g++ | ||
linux-imx6-g++ | ||
linux-imx53qsb-g++ | ||
linux-maemo-n9-g++ | ||
linux-mipsel-broadcom-97425-g++ | ||
linux-rasp-pi-g++ | ||
linux-sh4-stmicro-ST7108-g++ | ||
linux-sh4-stmicro-ST7540-g++ | ||
linux-snowball-g++ | ||
linux-tegra2-g++ |