diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-30 17:11:33 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-30 21:41:09 +0200 |
| commit | c97febccee64625eae2d08a86c4f15e04b908a2a (patch) | |
| tree | f3a387203d0b97adbe2ebef463878d89eabe1e07 /src/3rdparty | |
| parent | f3922dfbd191a78d489a32df6fb78b5f808e1241 (diff) | |
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>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/masm.pri | 77 |
1 files changed, 55 insertions, 22 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 |