diff --git a/.gitmodules b/.gitmodules
index bd07849034..c212beaf20 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "ThirdParty/fast_float"]
 	path = ThirdParty/fast_float
 	url = https://github.com/fastfloat/fast_float
+[submodule "ThirdParty/qtadvanceddocking"]
+	path = ThirdParty/qtadvanceddocking
+	url = https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5af32ce03b..0923db7e45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -264,7 +264,7 @@ set(CMAKE_CXX_COMPILER_LAUNCHER ${TEMP_CMAKE_CXX_COMPILER_LAUNCHER})
 # ##############################################################################
 # Go through required git submodules #
 # ##############################################################################
-list(APPEND THIRD_PARTY_SUBMODULES fast_float qwt)
+list(APPEND THIRD_PARTY_SUBMODULES fast_float qwt qtadvanceddocking)
 
 # ##############################################################################
 # Init GIT submodules if they haven't already #
@@ -455,6 +455,28 @@ endif()
 
 list(APPEND THIRD_PARTY_LIBRARIES qwt)
 
+# ##############################################################################
+# Qt Advanced Docking System
+# ##############################################################################
+set(ADS_VERSION "3.8.2")
+
+add_subdirectory(ThirdParty/qtadvanceddocking)
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  target_compile_options(qtadvanceddocking PRIVATE -Wno-deprecated-copy)
+elseif(MSVC)
+  target_compile_options(qtadvanceddocking PRIVATE /wd4996 /wd4005)
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  target_compile_options(qtadvanceddocking PRIVATE -Wno-deprecated)
+endif()
+
+if(RESINSIGHT_ENABLE_UNITY_BUILD)
+  message("Cmake Unity build is enabled on : QtADS")
+  set_property(TARGET qtadvanceddocking PROPERTY UNITY_BUILD true)
+endif()
+
+list(APPEND THIRD_PARTY_LIBRARIES qtadvanceddocking)
+
 # ##############################################################################
 # Nightcharts
 # ##############################################################################
diff --git a/ThirdParty/qtadvanceddocking b/ThirdParty/qtadvanceddocking
new file mode 160000
index 0000000000..75d58b3ea3
--- /dev/null
+++ b/ThirdParty/qtadvanceddocking
@@ -0,0 +1 @@
+Subproject commit 75d58b3ea310a609ecaee695ef8d0f065413bc86