diff --git a/CMakePresets.json b/CMakePresets.json
index 2491e2bb..8d153cfa 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -113,6 +113,8 @@
                 "CMAKE_BUILD_TYPE": "Debug",
                 "KDDockWidgets_QT6": "ON",
                 "KDDockWidgets_DEVELOPER_MODE": "ON",
+                "CMAKE_EXPORT_COMPILE_COMMANDS" : "ON",
+                "KDDockWidgets_UNITY_BUILD" : "OFF",
                 "ECM_ENABLE_SANITIZERS" : "'address;undefined'"
             },
             "environment": {
diff --git a/dev-qtquick.code-workspace b/dev-qtquick.code-workspace
index 09c7783f..052ef027 100644
--- a/dev-qtquick.code-workspace
+++ b/dev-qtquick.code-workspace
@@ -1,48 +1,42 @@
 {
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"settings": {
-		"files.associations": {
-            "qevent": "cpp",
-            "qvector": "cpp"
-        },
-        "C_Cpp.default.compileCommands" : "${workspaceFolder}/build-dev-qtquick/compile_commands.json",
-        "C_Cpp.default.cStandard": "c17",
-        "C_Cpp.default.intelliSenseMode": "gcc-x64",
-        "files.trimTrailingWhitespace": true
-	},
-	"tasks": {
-        "version": "2.0.0",
-        "tasks": [
-            {
-                "type": "shell",
-                "label": "cmake",
-                "command": "cmake",
-                "args": ["--preset=dev-qtquick"],
-                "options": {
-                    "cwd": "${workspaceFolder}/",
-                },
-                "problemMatcher": [
-                    "$gcc"
-                ],
-                "group": "build"
-            },
-            {
-                "type": "shell",
-                "label": "make",
-                "command": "cmake",
-                "args": ["--build", "${workspaceFolder}/build-dev-qtquick"],
-                "options": {
-                    "cwd": "${workspaceFolder}/",
-                },
-                "problemMatcher": [
-                    "$gcc"
-                ],
-                "group": "build"
-			}
-		]
+  "folders": [
+    {
+      "path": "."
     }
+  ],
+  "settings": {
+    "C_Cpp.default.compileCommands": "${workspaceFolder}/build-dev-qtquick/compile_commands.json",
+    "C_Cpp.default.cStandard": "c17",
+    "files.trimTrailingWhitespace": true
+  },
+  "tasks": {
+    "version": "2.0.0",
+    "tasks": [
+      {
+        "type": "shell",
+        "label": "cmake",
+        "command": "cmake",
+        "args": [
+          "--preset=dev-qtquick"
+        ],
+        "options": {
+          "cwd": "${workspaceFolder}/"
+        },
+        "group": "build"
+      },
+      {
+        "type": "shell",
+        "label": "make",
+        "command": "cmake",
+        "args": [
+          "--build",
+          "${workspaceFolder}/build-dev-qtquick"
+        ],
+        "options": {
+          "cwd": "${workspaceFolder}/"
+        },
+        "group": "build"
+      }
+    ]
+  }
 }
diff --git a/dev-qtwidgets.code-workspace b/dev-qtwidgets.code-workspace
index 91b87f6d..bd18efc2 100644
--- a/dev-qtwidgets.code-workspace
+++ b/dev-qtwidgets.code-workspace
@@ -1,48 +1,42 @@
 {
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"settings": {
-		"files.associations": {
-            "qevent": "cpp",
-            "qvector": "cpp"
-        },
-        "C_Cpp.default.compileCommands" : "${workspaceFolder}/build-dev-qtwidgets/compile_commands.json",
-        "C_Cpp.default.cStandard": "c17",
-        "C_Cpp.default.intelliSenseMode": "gcc-x64",
-        "files.trimTrailingWhitespace": true
-	},
-	"tasks": {
-        "version": "2.0.0",
-        "tasks": [
-            {
-                "type": "shell",
-                "label": "cmake",
-                "command": "cmake",
-                "args": ["--preset=dev-qtwidgets"],
-                "options": {
-                    "cwd": "${workspaceFolder}/",
-                },
-                "problemMatcher": [
-                    "$gcc"
-                ],
-                "group": "build"
-            },
-            {
-                "type": "shell",
-                "label": "make",
-                "command": "cmake",
-                "args": ["--build", "${workspaceFolder}/build-dev-qtwidgets"],
-                "options": {
-                    "cwd": "${workspaceFolder}/",
-                },
-                "problemMatcher": [
-                    "$gcc"
-                ],
-                "group": "build"
-			}
-		]
+  "folders": [
+    {
+      "path": "."
     }
+  ],
+  "settings": {
+    "C_Cpp.default.compileCommands": "${workspaceFolder}/build-dev-qtwidgets/compile_commands.json",
+    "C_Cpp.default.cStandard": "c17",
+    "files.trimTrailingWhitespace": true
+  },
+  "tasks": {
+    "version": "2.0.0",
+    "tasks": [
+      {
+        "type": "shell",
+        "label": "cmake",
+        "command": "cmake",
+        "args": [
+          "--preset=dev-qtwidgets"
+        ],
+        "options": {
+          "cwd": "${workspaceFolder}/"
+        },
+        "group": "build"
+      },
+      {
+        "type": "shell",
+        "label": "make",
+        "command": "cmake",
+        "args": [
+          "--build",
+          "${workspaceFolder}/build-dev-qtwidgets"
+        ],
+        "options": {
+          "cwd": "${workspaceFolder}/"
+        },
+        "group": "build"
+      }
+    ]
+  }
 }
diff --git a/dev-qtwidgets6.code-workspace b/dev-qtwidgets6.code-workspace
new file mode 100644
index 00000000..0a4d6ef6
--- /dev/null
+++ b/dev-qtwidgets6.code-workspace
@@ -0,0 +1,48 @@
+{
+  "folders": [
+    {
+      "path": "."
+    }
+  ],
+  "settings": {
+    "C_Cpp.default.compileCommands": "${workspaceFolder}/build-dev-qtwidgets6/compile_commands.json",
+    "C_Cpp.default.cStandard": "c17",
+    "files.trimTrailingWhitespace": true
+  },
+  "tasks": {
+    "version": "2.0.0",
+    "tasks": [
+      {
+        "type": "shell",
+        "label": "cmake",
+        "command": "cmake",
+        "args": [
+          "--preset=dev-qtwidgets6"
+        ],
+        "options": {
+          "cwd": "${workspaceFolder}/"
+        },
+        "group": "build",
+        "problemMatcher": [
+          "$gcc"
+        ]
+      },
+      {
+        "type": "shell",
+        "label": "make",
+        "command": "cmake",
+        "args": [
+          "--build",
+          "${workspaceFolder}/build-dev-qtwidgets6"
+        ],
+        "options": {
+          "cwd": "${workspaceFolder}/"
+        },
+        "group": "build",
+        "problemMatcher": [
+          "$gcc"
+        ]
+      }
+    ]
+  }
+}