Merge origin/master @ 5821f748 to release/21.12

eeeaceeb · Oliver Kellogg · 3ce01b6a · 5821f748 · eeeaceeb
Commit eeeaceeb authored Nov 21, 2021 by Oliver Kellogg
--- a/umbrello/dialogs/dialog_utils.cpp
+++ b/umbrello/dialogs/dialog_utils.cpp
@@ -96,7 +96,7 @@ void makeTagEditFields(UMLObject *o, QGridLayout *genLayout,
 * UMLStereotype.
 */
 void remakeTagEditFields(const QString &stereoText,
-                         UMLObject * o, QGridLayout * genLayout,
+                         UMLObject *, QGridLayout * genLayout,
                         QLabel    * pTagLabel[N_STEREOATTRS],
                         KLineEdit * pTagLineEdit[N_STEREOATTRS],
                         int row /* = 1 */)