3 files changed, 41 insertions, 4 deletions
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index 849313dddf..464a19d32e 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -48,7 +48,9 @@ add_qt_module(Bootstrap
         ../../corelib/kernel/qcoreapplication.cpp
         ../../corelib/kernel/qcoreglobaldata.cpp
         ../../corelib/kernel/qmetatype.cpp
+        ../../corelib/kernel/qsharedmemory.cpp
         ../../corelib/kernel/qsystemerror.cpp
+        ../../corelib/kernel/qsystemsemaphore.cpp
         ../../corelib/kernel/qvariant.cpp
         ../../corelib/plugin/quuid.cpp
         ../../corelib/serialization/qdatastream.cpp
@@ -72,7 +74,6 @@ add_qt_module(Bootstrap
         ../../corelib/tools/qcryptographichash.cpp
         ../../corelib/tools/qhash.cpp
         ../../corelib/tools/qline.cpp
-        ../../corelib/tools/qlinkedlist.cpp
         ../../corelib/tools/qlist.cpp
         ../../corelib/tools/qlocale.cpp
         ../../corelib/tools/qlocale_tools.cpp
@@ -120,6 +121,12 @@ extend_target(Bootstrap CONDITION UNIX
         ../../corelib/io/qfilesystemiterator_unix.cpp
         ../../corelib/io/qfsfileengine_unix.cpp
         ../../corelib/kernel/qcore_unix.cpp
+        ../../corelib/kernel/qsharedmemory_posix.cpp
+        ../../corelib/kernel/qsharedmemory_systemv.cpp
+        ../../corelib/kernel/qsharedmemory_unix.cpp
+        ../../corelib/kernel/qsystemsemaphore_posix.cpp
+        ../../corelib/kernel/qsystemsemaphore_systemv.cpp
+        ../../corelib/kernel/qsystemsemaphore_unix.cpp
 )
 
 extend_target(Bootstrap CONDITION WIN32
@@ -130,6 +137,8 @@ extend_target(Bootstrap CONDITION WIN32
         ../../corelib/io/qfsfileengine_win.cpp
         ../../corelib/io/qstandardpaths_win.cpp
         ../../corelib/kernel/qcoreapplication_win.cpp
+        ../../corelib/kernel/qsharedmemory_win.cpp
+        ../../corelib/kernel/qsystemsemaphore_win.cpp
         ../../corelib/plugin/qsystemlibrary.cpp
     PUBLIC_LIBRARIES
         advapi32
@@ -142,6 +151,9 @@ extend_target(Bootstrap CONDITION WIN32
 extend_target(Bootstrap CONDITION APPLE_OSX
     SOURCES
         ../../corelib/global/qoperatingsystemversion_darwin.mm
+        ../../corelib/io/qfilesystemengine_unix.cpp
+        ../../corelib/io/qfilesystemiterator_unix.cpp
+        ../../corelib/io/qfsfileengine_unix.cpp
         ../../corelib/io/qstandardpaths_mac.mm
         ../../corelib/kernel/qcore_foundation.mm
         ../../corelib/kernel/qcore_mac.cpp
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index ca9df20bd9..1d25e2e6e4 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -46,7 +46,9 @@ extend_target(Bootstrap
         ../../corelib/kernel/qcoreapplication.cpp
         ../../corelib/kernel/qcoreglobaldata.cpp
         ../../corelib/kernel/qmetatype.cpp
+        ../../corelib/kernel/qsharedmemory.cpp
         ../../corelib/kernel/qsystemerror.cpp
+        ../../corelib/kernel/qsystemsemaphore.cpp
         ../../corelib/kernel/qvariant.cpp
         ../../corelib/plugin/quuid.cpp
         ../../corelib/serialization/qdatastream.cpp
@@ -70,7 +72,6 @@ extend_target(Bootstrap
         ../../corelib/tools/qcryptographichash.cpp
         ../../corelib/tools/qhash.cpp
         ../../corelib/tools/qline.cpp
-        ../../corelib/tools/qlinkedlist.cpp
         ../../corelib/tools/qlist.cpp
         ../../corelib/tools/qlocale.cpp
         ../../corelib/tools/qlocale_tools.cpp
@@ -125,6 +126,12 @@ extend_target(Bootstrap CONDITION UNIX
         ../../corelib/io/qfilesystemiterator_unix.cpp
         ../../corelib/io/qfsfileengine_unix.cpp
         ../../corelib/kernel/qcore_unix.cpp
+        ../../corelib/kernel/qsharedmemory_posix.cpp
+        ../../corelib/kernel/qsharedmemory_systemv.cpp
+        ../../corelib/kernel/qsharedmemory_unix.cpp
+        ../../corelib/kernel/qsystemsemaphore_posix.cpp
+        ../../corelib/kernel/qsystemsemaphore_systemv.cpp
+        ../../corelib/kernel/qsystemsemaphore_unix.cpp
 )
 
 extend_target(Bootstrap CONDITION WIN32
@@ -135,6 +142,8 @@ extend_target(Bootstrap CONDITION WIN32
         ../../corelib/io/qfsfileengine_win.cpp
         ../../corelib/io/qstandardpaths_win.cpp
         ../../corelib/kernel/qcoreapplication_win.cpp
+        ../../corelib/kernel/qsharedmemory_win.cpp
+        ../../corelib/kernel/qsystemsemaphore_win.cpp
         ../../corelib/plugin/qsystemlibrary.cpp
     PUBLIC_LIBRARIES
         advapi32
@@ -147,6 +156,9 @@ extend_target(Bootstrap CONDITION WIN32
 extend_target(Bootstrap CONDITION APPLE_OSX
     SOURCES
         ../../corelib/global/qoperatingsystemversion_darwin.mm
+        ../../corelib/io/qfilesystemengine_unix.cpp
+        ../../corelib/io/qfilesystemiterator_unix.cpp
+        ../../corelib/io/qfsfileengine_unix.cpp
         ../../corelib/io/qstandardpaths_mac.mm
         ../../corelib/kernel/qcore_foundation.mm
         ../../corelib/kernel/qcore_mac.cpp
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 40c0702f0a..757460393e 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -60,6 +60,8 @@ SOURCES += \
            ../../corelib/kernel/qmetatype.cpp \
            ../../corelib/kernel/qvariant.cpp \
            ../../corelib/kernel/qsystemerror.cpp \
+           ../../corelib/kernel/qsharedmemory.cpp \
+           ../../corelib/kernel/qsystemsemaphore.cpp \
            ../../corelib/plugin/quuid.cpp \
            ../../corelib/serialization/qdatastream.cpp \
            ../../corelib/serialization/qjson.cpp \
@@ -82,7 +84,6 @@ SOURCES += \
            ../../corelib/tools/qcryptographichash.cpp \
            ../../corelib/tools/qhash.cpp \
            ../../corelib/tools/qlist.cpp \
-           ../../corelib/tools/qlinkedlist.cpp \
            ../../corelib/tools/qlocale.cpp \
            ../../corelib/tools/qlocale_tools.cpp \
            ../../corelib/tools/qmap.cpp \
@@ -103,6 +104,12 @@ SOURCES += \
            ../../xml/sax/qxml.cpp
 
 unix:SOURCES += ../../corelib/kernel/qcore_unix.cpp \
+                ../../corelib/kernel/qsharedmemory_posix.cpp \
+                ../../corelib/kernel/qsharedmemory_systemv.cpp \
+                ../../corelib/kernel/qsharedmemory_unix.cpp \
+                ../../corelib/kernel/qsystemsemaphore_posix.cpp \
+                ../../corelib/kernel/qsystemsemaphore_systemv.cpp \
+                ../../corelib/kernel/qsystemsemaphore_unix.cpp \
                 ../../corelib/io/qfilesystemengine_unix.cpp \
                 ../../corelib/io/qfilesystemiterator_unix.cpp \
                 ../../corelib/io/qfsfileengine_unix.cpp
@@ -112,12 +119,18 @@ win32:SOURCES += ../../corelib/global/qoperatingsystemversion_win.cpp \
                  ../../corelib/io/qfilesystemiterator_win.cpp \
                  ../../corelib/io/qfsfileengine_win.cpp \
                  ../../corelib/kernel/qcoreapplication_win.cpp \
+                 ../../corelib/kernel/qsharedmemory_win.cpp \
+                 ../../corelib/kernel/qsystemsemaphore_win.cpp \
                  ../../corelib/plugin/qsystemlibrary.cpp \
 
 mac {
     SOURCES += \
         ../../corelib/kernel/qcoreapplication_mac.cpp \
-        ../../corelib/kernel/qcore_mac.cpp
+        ../../corelib/kernel/qcore_mac.cpp \
+        ../../corelib/io/qfilesystemengine_unix.cpp \
+        ../../corelib/io/qfilesystemiterator_unix.cpp \
+        ../../corelib/io/qfsfileengine_unix.cpp
+
     OBJECTIVE_SOURCES += \
         ../../corelib/global/qoperatingsystemversion_darwin.mm \
         ../../corelib/kernel/qcore_mac_objc.mm \