diff --git a/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp b/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
index 77e95e649..284870e06 100644
--- a/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
+++ b/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */
diff --git a/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h b/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h
index b9c5d588f..19fdaa082 100644
--- a/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h
+++ b/3rdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.h
@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */
diff --git a/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp b/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp
index a13a45a27..3af326193 100644
--- a/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp
+++ b/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp
@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */
diff --git a/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.h b/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.h
index 82b759283..64b5c267f 100644
--- a/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.h
+++ b/3rdparty/kdsingleapplicationguard/kdsharedmemorylocker.h
@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */
diff --git a/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp b/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp
index 8ddf7aad6..52eb60d37 100644
--- a/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp
+++ b/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp
@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */
diff --git a/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h b/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h
index 8ac411a68..8e7c7b498 100644
--- a/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h
+++ b/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h
@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */
diff --git a/3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp b/3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp
index d3405e82f..f886189c3 100644
--- a/3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp
+++ b/3rdparty/kdsingleapplicationguard/kdtoolsglobal.cpp
@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */
diff --git a/3rdparty/kdsingleapplicationguard/kdtoolsglobal.h b/3rdparty/kdsingleapplicationguard/kdtoolsglobal.h
index 37ca5857e..5086ddd71 100644
--- a/3rdparty/kdsingleapplicationguard/kdtoolsglobal.h
+++ b/3rdparty/kdsingleapplicationguard/kdtoolsglobal.h
@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */
diff --git a/3rdparty/kdsingleapplicationguard/pimpl_ptr.cpp b/3rdparty/kdsingleapplicationguard/pimpl_ptr.cpp
index 35b52d419..f2b0a4dd9 100644
--- a/3rdparty/kdsingleapplicationguard/pimpl_ptr.cpp
+++ b/3rdparty/kdsingleapplicationguard/pimpl_ptr.cpp
@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */
diff --git a/3rdparty/kdsingleapplicationguard/pimpl_ptr.h b/3rdparty/kdsingleapplicationguard/pimpl_ptr.h
index 41b33b582..b8b4786ba 100644
--- a/3rdparty/kdsingleapplicationguard/pimpl_ptr.h
+++ b/3rdparty/kdsingleapplicationguard/pimpl_ptr.h
@@ -1,6 +1,6 @@
 /*
+ *   SPDX-FileCopyrightText: 2001-2010 Klaralvdalens Datakonsult AB.
  *   SPDX-License-Identifier: LGPL-2.0-only
- *   License-Filename: LICENSES/LGPLv2-KDAB
  *
  *   The KD Tools Library is Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.
  */
diff --git a/3rdparty/waitingspinnerwidget.cpp b/3rdparty/waitingspinnerwidget.cpp
index 45c689019..98931a6ad 100644
--- a/3rdparty/waitingspinnerwidget.cpp
+++ b/3rdparty/waitingspinnerwidget.cpp
@@ -1,6 +1,8 @@
 /*
+ *   SPDX-FileCopyrightText: 2012-2014 Alexander Turkin
+ *   SPDX-FileCopyrightText: 2014 William Hallatt
+ *   SPDX-FileCopyrightText: 2015 Jacob Dawid
  *   SPDX-License-Identifier: MIT
- *   License-Filename: LICENSES/MIT-QtWaitingSpinner
  */
 
 /* Original Work Copyright (c) 2012-2014 Alexander Turkin
diff --git a/3rdparty/waitingspinnerwidget.h b/3rdparty/waitingspinnerwidget.h
index b3e8df9a0..c8c6b9687 100644
--- a/3rdparty/waitingspinnerwidget.h
+++ b/3rdparty/waitingspinnerwidget.h
@@ -1,11 +1,14 @@
 /*
+ *   SPDX-FileCopyrightText: 2012-2014 Alexander Turkin
+ *   SPDX-FileCopyrightText: 2014 William Hallatt
+ *   SPDX-FileCopyrightText: 2015 Jacob Dawid
  *   SPDX-License-Identifier: MIT
- *   License-Filename: LICENSES/MIT-QtWaitingSpinner
  */
 
 /* Original Work Copyright (c) 2012-2014 Alexander Turkin
    Modified 2014 by William Hallatt
    Modified 2015 by Jacob Dawid
+
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to