diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:01:52 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:01:53 +0200 |
| commit | 607cabb999bb8eed58afb09a166d20e7e497196b (patch) | |
| tree | f79c7b9007c6e02aa227029b30861e061942ee1b /tests | |
| parent | 8f1a401c7a52038008b1807b65f599021b9545f8 (diff) | |
| parent | 700b5d89a1040faba1145999e64ce31e37d5b782 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I9415598f9f46c3c6cb104a03f15fe6ec8f16b8d2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qquickmenu/tst_qquickmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index adb3d7aa..27cd8aaa 100644 --- a/tests/auto/qquickmenu/tst_qquickmenu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -124,7 +124,7 @@ void tst_QQuickMenu::count() QCOMPARE(menu->count(), 1); QCOMPARE(countSpy.count(), 3); - QQuickItem *item = menu->takeItem(0); + QScopedPointer<QQuickItem> item(menu->takeItem(0)); QVERIFY(item); QCOMPARE(menu->count(), 0); QCOMPARE(countSpy.count(), 4); |