diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-26 14:35:05 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-07-26 17:05:34 +0200 |
| commit | d526a72c44cf3ed8d53c8d2b1c08dc5e7f1afe61 (patch) | |
| tree | 63095d57f307bb9b90ab90e5dde98ae23e539c46 /tests/auto/qml/ecmascripttests | |
| parent | cbe445dd915760d81a467b5285bacd208e44e365 (diff) | |
| parent | aeec2f94c376c9a0e84bbbb3be4652384c7da113 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/quick/handlers/qquickpointerdevicehandler.cpp
src/quick/scenegraph/qsgdefaultglyphnode.cpp
src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
src/quick/scenegraph/qsgdefaultglyphnode_p_p.h
tests/auto/qml/qjsengine/tst_qjsengine.cpp
Done-With: Jan Arve Sæther <jan-arve.saether@qt.io>
Done-With: Laszlo Agocs <laszlo.agocs@qt.io>
Change-Id: I35749152f8dce44b9af8d52b1283629879010f11
Diffstat (limited to 'tests/auto/qml/ecmascripttests')
| -rw-r--r-- | tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp b/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp index 33efcb4da4..9fe2de5368 100644 --- a/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp +++ b/tests/auto/qml/ecmascripttests/qjstest/test262runner.cpp @@ -597,7 +597,7 @@ void SingleTest::run() void SingleTest::runExternalTest() { - auto runTest = [=] (const char *header, TestCase::Result *result) { + auto runTest = [this] (const char *header, TestCase::Result *result) { QTemporaryFile tempFile; tempFile.open(); tempFile.write(header); |