diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-07 16:01:30 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-15 13:32:47 +0200 |
| commit | 98a31ff6b9673b020a688d7d035f03a6497a6f5f (patch) | |
| tree | 110e6c3d8e1880b99b4624d678828b930988e406 /src/qml/jit | |
| parent | 62b94166cc99dd5fb663c76cfa38e9e888baae59 (diff) | |
Adapt to changes in qtbase
Due to qiterable.h specializing a template declared in qmetatype.h we
temporarily need to include it in a few tests so that the iterables
work.
Change-Id: Ia32392419dead76eaf2b91b2ec4157b726d8de74
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/jit')
| -rw-r--r-- | src/qml/jit/qv4assemblercommon.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/jit/qv4assemblercommon.cpp b/src/qml/jit/qv4assemblercommon.cpp index 27b658ab72..137a04cc10 100644 --- a/src/qml/jit/qv4assemblercommon.cpp +++ b/src/qml/jit/qv4assemblercommon.cpp @@ -110,7 +110,8 @@ static void printDisassembledOutputWithCalls(QByteArray processedOutput, break; const char *functionName = it.value(); processedOutput = processedOutput.insert( - idx, padding + QByteArray(functionName ? functionName : symbols[it.key()])); + idx, QByteArray(padding + QByteArray( + functionName ? functionName : symbols[it.key()]))); } } |