diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-08 11:22:50 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-08 11:00:29 +0000 |
| commit | d7161f3af6104faaedb68e1a8a4277dabeb1f8af (patch) | |
| tree | 76fb423dc737dbf4bcb211bd503af6a4e0b9bb5a /src/3rdparty | |
| parent | da35e3233335545125da51714298db6134cecb67 (diff) | |
Fix compilation of qmldevtools on Windows when cross-compiling
The use of wildcards in SOURCES is an unspecified "feature" and
it turns out that it doesn't work when doing option(host_build)
and cross-compiling. We could use $$files(), but there is no
truly good reason for using it for only some directories and not
others, so this is now a manual expansion.
Task-number: QTBUG-58705
Change-Id: Ib3bd7bbba01fe4130703d5635fa344b62caea5bb
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/masm.pri | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index c63cd5da66..248be6e18c 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -31,7 +31,17 @@ HEADERS += $$PWD/stubs/WTFStubs.h SOURCES += $$PWD/stubs/Options.cpp -HEADERS += $$PWD/stubs/wtf/*.h +HEADERS += $$PWD/stubs/wtf/FastAllocBase.h \ + $$PWD/stubs/wtf/FastMalloc.h \ + $$PWD/stubs/wtf/Noncopyable.h \ + $$PWD/stubs/wtf/OwnPtr.h \ + $$PWD/stubs/wtf/PassOwnPtr.h \ + $$PWD/stubs/wtf/PassRefPtr.h \ + $$PWD/stubs/wtf/RefCounted.h \ + $$PWD/stubs/wtf/RefPtr.h \ + $$PWD/stubs/wtf/TypeTraits.h \ + $$PWD/stubs/wtf/UnusedParam.h \ + $$PWD/stubs/wtf/Vector.h SOURCES += $$PWD/disassembler/Disassembler.cpp SOURCES += $$PWD/disassembler/UDis86Disassembler.cpp @@ -67,9 +77,19 @@ SOURCES += $$PWD/disassembler/ARM64Disassembler.cpp SOURCES += $$PWD/disassembler/ARM64/A64DOpcode.cpp HEADERS += $$PWD/disassembler/ARM64/A64DOpcode.h -SOURCES += $$PWD/yarr/*.cpp -HEADERS += $$PWD/yarr/*.h - +SOURCES += $$PWD/yarr/YarrCanonicalizeUCS2.cpp \ + $$PWD/yarr/YarrInterpreter.cpp \ + $$PWD/yarr/YarrJIT.cpp \ + $$PWD/yarr/YarrPattern.cpp \ + $$PWD/yarr/YarrSyntaxChecker.cpp + +HEADERS += $$PWD/yarr/Yarr.h \ + $$PWD/yarr/YarrCanonicalizeUCS2.h \ + $$PWD/yarr/YarrInterpreter.h \ + $$PWD/yarr/YarrJIT.h \ + $$PWD/yarr/YarrParser.h \ + $$PWD/yarr/YarrPattern.h \ + $$PWD/yarr/YarrSyntaxChecker.h # # Generate RegExpJitTables.h # |