2 files changed, 4 insertions, 32 deletions
diff --git a/mkspecs/features/data/mac/objc_namespace.sh b/mkspecs/features/data/mac/objc_namespace.sh
index 5ce25900f0..10ace4ff55 100755
--- a/mkspecs/features/data/mac/objc_namespace.sh
+++ b/mkspecs/features/data/mac/objc_namespace.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright (C) 2017 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 script_argument_prefix="-Wobjc_namespace,--"
 
@@ -79,7 +79,7 @@ read_32bit_value() {
 
 otool_args=
 otool() {
-    command otool $otool_args $*
+    command otool $otool_args "$@"
 }
 
 declare -a extra_classnames_files
@@ -197,13 +197,13 @@ if [ "${mach_header[0]}" != "MH_MAGIC_64" ]; then
     exit 1
 fi
 
-architectures=$(otool -f -v $target | grep architecture)
+architectures=$(otool -f -v "$target" | grep architecture)
 
 setup_arch() {
     arch="$1"
     if [ ! -z "$arch" ]; then
         otool_args="-arch $arch"
-        offset=$(otool -f -v $target | grep -A 6 "architecture $arch" | grep offset)
+        offset=$(otool -f -v "$target" | grep -A 6 "architecture $arch" | grep offset)
         offset="${offset##*( )}"
         arch_offset="$(echo $offset | cut -d ' ' -f 2)"
         echo "🤖 Processing architecture '$arch' at offset $arch_offset..."
diff --git a/mkspecs/features/data/unix/findclasslist.pl b/mkspecs/features/data/unix/findclasslist.pl
deleted file mode 100644
index 4971dcb5ba..0000000000
--- a/mkspecs/features/data/unix/findclasslist.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env perl
-# Copyright (C) 2016 Intel Corporation.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-use strict;
-my $syntax = "findclasslist.pl\n" .
-             "Replaces each \@FILE:filename\@ in stdin with the classes found in that file\n";
-
-$\ = $/;
-while (<STDIN>) {
-    chomp;
-    unless (/\@FILE:(.*)\@/) {
-        print;
-        next;
-    }
-
-    # Replace this line with the class list
-    open HDR, "<$1" or die("Could not open header $1: $!");
-    my $comment = "    /* $1 */";
-    while (my $line = <HDR>) {
-        # Match a struct or class declaration, but not a forward declaration
-        $line =~ /^(?:struct|class|namespace) (?:Q_.*_EXPORT)? (\w+)(?!;)/ or next;
-        print $comment if $comment;
-        printf "    *%d%s*;\n", length $1, $1;
-        $comment = 0;
-    }
-    close HDR;
-}