diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-07-25 09:38:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-07-25 09:38:09 +0200 |
| commit | 8e376ab3403967280b3ca6bfd42b5641ce0f05bc (patch) | |
| tree | b31b1aea57155531e5b423939f96ac80d824c5c6 /src/plugins/cppeditor/cppuseselections_test.cpp | |
| parent | a7bf0c0ea1649fdf9bc4f4b5b312d818929b470c (diff) | |
| parent | d9e847150f0d78fad1e902d7a53e2912db39e60b (diff) | |
| download | qt-creator-8e376ab3403967280b3ca6bfd42b5641ce0f05bc.tar.gz | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
src/plugins/baremetal/iarewtoolchain.cpp
Change-Id: I483e81d7e920e724fb7cde84a8f6fa9bce4cd518
Diffstat (limited to 'src/plugins/cppeditor/cppuseselections_test.cpp')
| -rw-r--r-- | src/plugins/cppeditor/cppuseselections_test.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/cppeditor/cppuseselections_test.cpp b/src/plugins/cppeditor/cppuseselections_test.cpp index f917c59461..8eb1700a06 100644 --- a/src/plugins/cppeditor/cppuseselections_test.cpp +++ b/src/plugins/cppeditor/cppuseselections_test.cpp @@ -101,7 +101,6 @@ UseSelectionsTestCase::UseSelectionsTestCase(TestDocument &testFile, bool hasTimedOut; const SelectionList selections = waitForUseSelections(&hasTimedOut); QEXPECT_FAIL("non-local use as macro argument - argument expanded 1", "TODO", Abort); - QEXPECT_FAIL("macro use 2", "TODO", Abort); QVERIFY(!hasTimedOut); // foreach (const Selection &selection, selections) // qDebug() << QTest::toString(selection); |