examples/xml/htmlinfo/trolltech_com.html | 3 0 + 3 - 0 !
1 file changed, 3 deletions(-)

 remove icon link from example html file
 This patch removes a suposedly privacy breach detected by lintian.
 As the Trolltech site is down and the example is simply not working I am
 just removing the link to it.

mkspecs/hurd-g++/qmake.conf | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 hurd mkspec: remove x11r6-related library and include dirs
 Such X11 dirs have not been there for years now, and they can cause build
 issues in cmake-based projects (as they make cmake look in those directories
 for extra stuff like libGL)

src/corelib/arch/qatomic_mips.h | 5 4 + 1 - 0 !
1 file changed, 4 insertions(+), 1 deletion(-)

 support atomic on pre-mips32 archs, also in orderedmemoryfence
 Set pre-MIPS32 opcodes also in orderedMemoryFence.

mkspecs/features/qt_functions.prf | 2 2 + 0 - 0 !
mkspecs/gnukfreebsd-g++/qmake.conf | 52 52 + 0 - 0 !
mkspecs/gnukfreebsd-g++/qplatformdefs.h | 92 92 + 0 - 0 !
3 files changed, 146 insertions(+)

 initial gnu/kfreebsd support
 - add a gnukfreebsd-g++ qmake mkspec, mostly copied from the hurd-g++ one
 - properly use LD_LIBRARY_PATH on GNU/* systems

src/corelib/json/qjson_p.h | 23 20 + 3 - 0 !
1 file changed, 20 insertions(+), 3 deletions(-)

 [patch] fix bugs in internal comparison operators
 Lisandro removed the tests part as it didn't apply and we are not
 running them anyway.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


The comparison operators between QJsonPrivate::String
and QJsonPrivate::Latin1String weren't all correct, leading
to wrong sorting of keys in QJsonObjects when the keys were
outside of the latin1 range and resulting lookup errors.

Task-number: QTBUG-41100

src/gui/image/qbmphandler.cpp | 21 15 + 6 - 0 !
src/gui/image/qgifhandler.cpp | 2 2 + 0 - 0 !
src/plugins/imageformats/ico/qicohandler.cpp | 2 1 + 1 - 0 !
3 files changed, 18 insertions(+), 7 deletions(-)

 fix cve-2015-0295, cve-2015-1858, cve-2015-1859, cve-2015-1860

src/network/bearer/qnetworkconfigmanager_p.cpp | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 prevent bad-ptrs deref in qnetworkconfigurationmanagerprivate

src/plugins/platforms/xcb/qxcbwindow.cpp | 6 6 + 0 - 0 !
1 file changed, 6 insertions(+)

 xcb: delay showing tray icon window until it is embedded
 Otherwise there is a race condition: when the tray implementation
 gets around to embedding the window, if it was already shown,
 it will be unmapped, embedded, and then remapped. Some tray
 implementations will resize the tray icon to 1 pixel wide in
 that case. We also never want to show a window that was intended
 for the tray in any other location, so it's better that it remain
 invisible until we are sure it is embedded.

src/corelib/thread/qbasicatomic.h | 2 0 + 2 - 0 !
1 file changed, 2 deletions(-)

 do not use specific headers for sparc atomics
 By removing the unexistant sparc headers the C++11 ones will be used.

examples/xml/htmlinfo/trolltech_com.html | 45 0 + 45 - 0 !
1 file changed, 45 deletions(-)

 remove tracking javascript from examples

config.tests/unix/bsymbolic_functions.test | 4 0 + 4 - 0 !
1 file changed, 4 deletions(-)

 revert upstream's disabling of -bsymbolic-functions on non-x86
 The claimed binutils upstream fix is already in utopic:
 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=97323ad11305610185a0265392cabcd37510f50e