Remove qmake wildcard in masm.pri

It stopped working on Windows after the QRegularExpression refactoring
of qmake.

Change-Id: Ic91193ffe709eae36104a7ffd9c09d6b4461322f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

3 files changed, 131 insertions, 29 deletions

diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
index de4cacc7c9..eb915ca0ce 100644
--- a/src/3rdparty/masm/masm.pri
+++ b/src/3rdparty/masm/masm.pri
@@ -1,29 +1,62 @@
-HEADERS += $$PWD/assembler/*.h
-SOURCES += $$PWD/assembler/ARMv7Assembler.cpp
-SOURCES += $$PWD/assembler/LinkBuffer.cpp
-
-HEADERS += $$PWD/wtf/*.h
-SOURCES += $$PWD/wtf/PrintStream.cpp
-HEADERS += $$PWD/wtf/PrintStream.h
-
-SOURCES += $$PWD/wtf/FilePrintStream.cpp
-HEADERS += $$PWD/wtf/FilePrintStream.h
-
-HEADERS += $$PWD/wtf/RawPointer.h
+HEADERS += $$PWD/assembler/AbstractMacroAssembler.h \
+    $$PWD/assembler/ARM64Assembler.h \
+    $$PWD/assembler/ARMv7Assembler.h \
+    $$PWD/assembler/AssemblerBuffer.h \
+    $$PWD/assembler/AssemblerBufferWithConstantPool.h \
+    $$PWD/assembler/CodeLocation.h \
+    $$PWD/assembler/LinkBuffer.h \
+    $$PWD/assembler/MacroAssemblerARM64.h \
+    $$PWD/assembler/MacroAssemblerARMv7.h \
+    $$PWD/assembler/MacroAssemblerCodeRef.h \
+    $$PWD/assembler/MacroAssembler.h \
+    $$PWD/assembler/MacroAssemblerMIPS.h \
+    $$PWD/assembler/MacroAssemblerX86_64.h \
+    $$PWD/assembler/MacroAssemblerX86Common.h \
+    $$PWD/assembler/MacroAssemblerX86.h \
+    $$PWD/assembler/MIPSAssembler.h \
+    $$PWD/assembler/RepatchBuffer.h \
+    $$PWD/assembler/X86Assembler.h
+
+SOURCES += $$PWD/assembler/ARMv7Assembler.cpp \
+    $$PWD/assembler/LinkBuffer.cpp
+
+HEADERS += $$PWD/wtf/ASCIICType.h \
+    $$PWD/wtf/Assertions.h \
+    $$PWD/wtf/Atomics.h \
+    $$PWD/wtf/BumpPointerAllocator.h \
+    $$PWD/wtf/CheckedArithmetic.h \
+    $$PWD/wtf/Compiler.h \
+    $$PWD/wtf/CryptographicallyRandomNumber.h \
+    $$PWD/wtf/DataLog.h \
+    $$PWD/wtf/DynamicAnnotations.h \
+    $$PWD/wtf/EnumClass.h \
+    $$PWD/wtf/FeatureDefines.h \
+    $$PWD/wtf/FilePrintStream.h \
+    $$PWD/wtf/Locker.h \
+    $$PWD/wtf/MathExtras.h \
+    $$PWD/wtf/NotFound.h \
+    $$PWD/wtf/NullPtr.h \
+    $$PWD/wtf/OSAllocator.h \
+    $$PWD/wtf/PageAllocationAligned.h \
+    $$PWD/wtf/PageAllocation.h \
+    $$PWD/wtf/PageBlock.h \
+    $$PWD/wtf/PageReservation.h \
+    $$PWD/wtf/Platform.h \
+    $$PWD/wtf/PossiblyNull.h \
+    $$PWD/wtf/PrintStream.h \
+    $$PWD/wtf/RawPointer.h \
+    $$PWD/wtf/SegmentedVector.h \
+    $$PWD/wtf/StdLibExtras.h \
+    $$PWD/wtf/VMTags.h
+
+SOURCES += $$PWD/wtf/PrintStream.cpp \
+  $$PWD/wtf/FilePrintStream.cpp \
+  $$PWD/wtf/PageAllocationAligned.cpp \
+  $$PWD/wtf/PageBlock.cpp
 
 win32: SOURCES += $$PWD/wtf/OSAllocatorWin.cpp
 else:integrity: SOURCES += $$PWD/wtf/OSAllocatorIntegrity.cpp
 else: SOURCES += $$PWD/wtf/OSAllocatorPosix.cpp
-HEADERS += $$PWD/wtf/OSAllocator.h
-
-SOURCES += $$PWD/wtf/PageAllocationAligned.cpp
-HEADERS += $$PWD/wtf/PageAllocationAligned.h
-HEADERS += $$PWD/wtf/PageAllocation.h
-
-SOURCES += $$PWD/wtf/PageBlock.cpp
-HEADERS += $$PWD/wtf/PageBlock.h
-
-HEADERS += $$PWD/wtf/PageReservation.h
 
 SOURCES += $$PWD/stubs/WTFStubs.cpp
 HEADERS += $$PWD/stubs/WTFStubs.h
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index c950c4304c..0d9704423c 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -8,9 +8,24 @@ qt_add_module(Qml
     GENERATE_METATYPES
     PLUGIN_TYPES qmltooling
     SOURCES
-        ../3rdparty/masm/assembler/*.h
-        ../3rdparty/masm/assembler/ARMv7Assembler.cpp
-        ../3rdparty/masm/assembler/LinkBuffer.cpp
+        ../3rdparty/masm/assembler/ARM64Assembler.h
+        ../3rdparty/masm/assembler/ARMv7Assembler.cpp ../3rdparty/masm/assembler/ARMv7Assembler.h
+        ../3rdparty/masm/assembler/AbstractMacroAssembler.h
+        ../3rdparty/masm/assembler/AssemblerBuffer.h
+        ../3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h
+        ../3rdparty/masm/assembler/CodeLocation.h
+        ../3rdparty/masm/assembler/LinkBuffer.cpp ../3rdparty/masm/assembler/LinkBuffer.h
+        ../3rdparty/masm/assembler/MIPSAssembler.h
+        ../3rdparty/masm/assembler/MacroAssembler.h
+        ../3rdparty/masm/assembler/MacroAssemblerARM64.h
+        ../3rdparty/masm/assembler/MacroAssemblerARMv7.h
+        ../3rdparty/masm/assembler/MacroAssemblerCodeRef.h
+        ../3rdparty/masm/assembler/MacroAssemblerMIPS.h
+        ../3rdparty/masm/assembler/MacroAssemblerX86.h
+        ../3rdparty/masm/assembler/MacroAssemblerX86Common.h
+        ../3rdparty/masm/assembler/MacroAssemblerX86_64.h
+        ../3rdparty/masm/assembler/RepatchBuffer.h
+        ../3rdparty/masm/assembler/X86Assembler.h
         ../3rdparty/masm/disassembler/ARM64/A64DOpcode.cpp ../3rdparty/masm/disassembler/ARM64/A64DOpcode.h
         ../3rdparty/masm/disassembler/ARM64Disassembler.cpp
         ../3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.cpp ../3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.h
@@ -33,15 +48,34 @@ qt_add_module(Qml
         ../3rdparty/masm/stubs/wtf/UnusedParam.h
         ../3rdparty/masm/stubs/wtf/Vector.h
         ../3rdparty/masm/stubs/yarr/YarrUnicodeProperties.cpp
-        ../3rdparty/masm/wtf/*.h
+        ../3rdparty/masm/wtf/ASCIICType.h
+        ../3rdparty/masm/wtf/Assertions.h
+        ../3rdparty/masm/wtf/Atomics.h
+        ../3rdparty/masm/wtf/BumpPointerAllocator.h
+        ../3rdparty/masm/wtf/CheckedArithmetic.h
+        ../3rdparty/masm/wtf/Compiler.h
+        ../3rdparty/masm/wtf/CryptographicallyRandomNumber.h
+        ../3rdparty/masm/wtf/DataLog.h
+        ../3rdparty/masm/wtf/DynamicAnnotations.h
+        ../3rdparty/masm/wtf/EnumClass.h
+        ../3rdparty/masm/wtf/FeatureDefines.h
         ../3rdparty/masm/wtf/FilePrintStream.cpp ../3rdparty/masm/wtf/FilePrintStream.h
+        ../3rdparty/masm/wtf/Locker.h
+        ../3rdparty/masm/wtf/MathExtras.h
+        ../3rdparty/masm/wtf/NotFound.h
+        ../3rdparty/masm/wtf/NullPtr.h
         ../3rdparty/masm/wtf/OSAllocator.h
         ../3rdparty/masm/wtf/PageAllocation.h
         ../3rdparty/masm/wtf/PageAllocationAligned.cpp ../3rdparty/masm/wtf/PageAllocationAligned.h
         ../3rdparty/masm/wtf/PageBlock.cpp ../3rdparty/masm/wtf/PageBlock.h
         ../3rdparty/masm/wtf/PageReservation.h
+        ../3rdparty/masm/wtf/Platform.h
+        ../3rdparty/masm/wtf/PossiblyNull.h
         ../3rdparty/masm/wtf/PrintStream.cpp ../3rdparty/masm/wtf/PrintStream.h
         ../3rdparty/masm/wtf/RawPointer.h
+        ../3rdparty/masm/wtf/SegmentedVector.h
+        ../3rdparty/masm/wtf/StdLibExtras.h
+        ../3rdparty/masm/wtf/VMTags.h
         ../3rdparty/masm/yarr/Yarr.h
         ../3rdparty/masm/yarr/YarrCanonicalizeUCS2.cpp ../3rdparty/masm/yarr/YarrCanonicalizeUCS2.h
         ../3rdparty/masm/yarr/YarrCanonicalizeUnicode.cpp
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index 14312ee5a3..461b2b8d7c 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -8,9 +8,25 @@ qt_add_module(Qml
     GENERATE_METATYPES
     PLUGIN_TYPES qmltooling
     SOURCES
-        # ../3rdparty/masm/assembler/*.h special case remove
+        ../3rdparty/masm/assembler/ARM64Assembler.h
+        ../3rdparty/masm/assembler/ARMv7Assembler.cpp ../3rdparty/masm/assembler/ARMv7Assembler.h
+        ../3rdparty/masm/assembler/AbstractMacroAssembler.h
+        ../3rdparty/masm/assembler/AssemblerBuffer.h
+        ../3rdparty/masm/assembler/AssemblerBufferWithConstantPool.h
+        ../3rdparty/masm/assembler/CodeLocation.h
+        ../3rdparty/masm/assembler/LinkBuffer.cpp ../3rdparty/masm/assembler/LinkBuffer.h
+        ../3rdparty/masm/assembler/MIPSAssembler.h
+        ../3rdparty/masm/assembler/MacroAssembler.h
+        ../3rdparty/masm/assembler/MacroAssemblerARM64.h
+        ../3rdparty/masm/assembler/MacroAssemblerARMv7.h
+        ../3rdparty/masm/assembler/MacroAssemblerCodeRef.h
+        ../3rdparty/masm/assembler/MacroAssemblerMIPS.h
+        ../3rdparty/masm/assembler/MacroAssemblerX86.h
+        ../3rdparty/masm/assembler/MacroAssemblerX86Common.h
+        ../3rdparty/masm/assembler/MacroAssemblerX86_64.h
+        ../3rdparty/masm/assembler/RepatchBuffer.h
+        ../3rdparty/masm/assembler/X86Assembler.h
         ../3rdparty/masm/assembler/ARMv7Assembler.cpp
-        ../3rdparty/masm/assembler/LinkBuffer.cpp
         ../3rdparty/masm/disassembler/ARM64/A64DOpcode.cpp ../3rdparty/masm/disassembler/ARM64/A64DOpcode.h
         ../3rdparty/masm/disassembler/ARM64Disassembler.cpp
         ../3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.cpp ../3rdparty/masm/disassembler/ARMv7/ARMv7DOpcode.h
@@ -33,15 +49,34 @@ qt_add_module(Qml
         ../3rdparty/masm/stubs/wtf/UnusedParam.h
         ../3rdparty/masm/stubs/wtf/Vector.h
         ../3rdparty/masm/stubs/yarr/YarrUnicodeProperties.cpp
-        # ../3rdparty/masm/wtf/*.h special case remove
+        ../3rdparty/masm/wtf/ASCIICType.h
+        ../3rdparty/masm/wtf/Assertions.h
+        ../3rdparty/masm/wtf/Atomics.h
+        ../3rdparty/masm/wtf/BumpPointerAllocator.h
+        ../3rdparty/masm/wtf/CheckedArithmetic.h
+        ../3rdparty/masm/wtf/Compiler.h
+        ../3rdparty/masm/wtf/CryptographicallyRandomNumber.h
+        ../3rdparty/masm/wtf/DataLog.h
+        ../3rdparty/masm/wtf/DynamicAnnotations.h
+        ../3rdparty/masm/wtf/EnumClass.h
+        ../3rdparty/masm/wtf/FeatureDefines.h
         ../3rdparty/masm/wtf/FilePrintStream.cpp ../3rdparty/masm/wtf/FilePrintStream.h
+        ../3rdparty/masm/wtf/Locker.h
+        ../3rdparty/masm/wtf/MathExtras.h
+        ../3rdparty/masm/wtf/NotFound.h
+        ../3rdparty/masm/wtf/NullPtr.h
         ../3rdparty/masm/wtf/OSAllocator.h
         ../3rdparty/masm/wtf/PageAllocation.h
         ../3rdparty/masm/wtf/PageAllocationAligned.cpp ../3rdparty/masm/wtf/PageAllocationAligned.h
         ../3rdparty/masm/wtf/PageBlock.cpp ../3rdparty/masm/wtf/PageBlock.h
         ../3rdparty/masm/wtf/PageReservation.h
+        ../3rdparty/masm/wtf/Platform.h
+        ../3rdparty/masm/wtf/PossiblyNull.h
         ../3rdparty/masm/wtf/PrintStream.cpp ../3rdparty/masm/wtf/PrintStream.h
         ../3rdparty/masm/wtf/RawPointer.h
+        ../3rdparty/masm/wtf/SegmentedVector.h
+        ../3rdparty/masm/wtf/StdLibExtras.h
+        ../3rdparty/masm/wtf/VMTags.h
         ../3rdparty/masm/yarr/Yarr.h
         ../3rdparty/masm/yarr/YarrCanonicalizeUCS2.cpp ../3rdparty/masm/yarr/YarrCanonicalizeUCS2.h
         ../3rdparty/masm/yarr/YarrCanonicalizeUnicode.cpp