diff options
author | Robin Burchell <robin.burchell@collabora.com> | 2011-12-10 16:01:05 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-15 21:04:27 +0100 |
commit | ec9ea7f3e819cb0c2da8c8977f9cc44688c9b6f6 (patch) | |
tree | 4dbe6e382682325bae8e6ea60b7694795cac1073 /src/platformsupport | |
parent | 033003663172fa6fd2eb5be7bef9e12effd49de6 (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>
Diffstat (limited to 'src/platformsupport')
0 files changed, 0 insertions, 0 deletions