projects / profile / ivi / qtbase.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0330036) | patch
Merge integrity support into unix.
authorRobin Burchell <robin.burchell@collabora.com>
Sat, 10 Dec 2011 15:01:05 +0000 (16:01 +0100)
committerQt by Nokia <qt-info@nokia.com>
Thu, 15 Dec 2011 20:04:27 +0000 (21:04 +0100)
commitec9ea7f3e819cb0c2da8c8977f9cc44688c9b6f6
tree4dbe6e382682325bae8e6ea60b7694795cac1073tree | snapshot
parent033003663172fa6fd2eb5be7bef9e12effd49de6commit | diff
Merge integrity support into unix.

Since integrity was pulling in all the same code (except the glib-in-QT_CONFIG
branch), we can just merge this in.

This shouldn't break integrity unless they somehow magically inject glib into
QT_CONFIG without actually having glib, but the removal of redundancy makes this
worthwhile.

Change-Id: I527b5e60bea4452fdca5eedfe729214f16519234
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
src/corelib/kernel/kernel.pri diff | blob | history
Domain: UI Framework / Uncategorized;