diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-15 21:30:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-15 21:37:14 +0200 |
| commit | 96b2323355a082599b7191f3079e8363bee825e0 (patch) | |
| tree | ec2c3737566802816eb8aed8539a354179394359 /src/plugins | |
| parent | 83e9d165761ad68730722aeb0bffb8fabe555d1f (diff) | |
| parent | 0af2998cc99e90e3df34f794801340d8a769c735 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
src/qml/jsruntime/qv4engine.cpp
Change-Id: I5f7b63a937a214267e15ad5757844d662a4f981b
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp index 107ec60943..d57d7e7406 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp @@ -277,7 +277,7 @@ GatherSourcesJob::GatherSourcesJob(QV4::ExecutionEngine *engine) void GatherSourcesJob::run() { - for (QV4::CompiledData::CompilationUnit *unit : qAsConst(engine->compilationUnits)) { + for (QV4::CompiledData::CompilationUnit *unit : engine->compilationUnits) { QString fileName = unit->fileName(); if (!fileName.isEmpty()) sources.append(fileName); |