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>

diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index 147f20a..1139e30 100644 (file)
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -99,7 +99,7 @@ nacl {
         kernel/qfunctions_nacl.h
 }
 
-unix {
+unix|integrity {
     SOURCES += \
             kernel/qcore_unix.cpp \
             kernel/qcrashhandler.cpp \
@@ -133,21 +133,3 @@ vxworks {
                 kernel/qfunctions_vxworks.h
 }
 
-
-integrity {
-       SOURCES += \
-                 kernel/qcore_unix.cpp \
-                 kernel/qcrashhandler.cpp \
-                 kernel/qsharedmemory_unix.cpp \
-                 kernel/qsystemsemaphore_unix.cpp \
-                 kernel/qeventdispatcher_unix.cpp \
-                 kernel/qtimerinfo_unix.cpp
-       HEADERS += \
-                 kernel/qcore_unix_p.h \
-                 kernel/qcrashhandler_p.h \
-                 kernel/qeventdispatcher_unix_p.h \
-                 kernel/qtimerinfo_unix_p.h
-
-   contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)
-}
-