diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-08-26 10:30:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-09-01 06:58:04 +0000 |
| commit | 04e50438eb85c1b2be6d4dcdfd5319cdb55ae576 (patch) | |
| tree | 4a3e9f078730bb538e2ca2751d189ff14a89901e /tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp | |
| parent | 34a9491a08639f8df0b55d74d51f4dadaa1cc2fd (diff) | |
| download | qt-creator-04e50438eb85c1b2be6d4dcdfd5319cdb55ae576.tar.gz | |
Utils: Remove Utils::optional
Since we are now requiring macOS 10.14 we can remove our local
implementation of optional and use std::optional for macOS too.
Change-Id: I2bd018261b68da64f7f031a812045dd7784697e1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp')
| -rw-r--r-- | tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp b/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp index 761d752b2a..43f28c2de9 100644 --- a/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp +++ b/tests/auto/pointeralgorithm/tst_pointeralgorithm.cpp @@ -272,8 +272,8 @@ void tst_PointerAlgorithm::take() int foo = 42; QVERIFY(Utils::take(vector, ptrVector.at(0)).value().get() == ptrVector.at(0)); - QVERIFY(Utils::take(vector, ptrVector.at(0)) == Utils::nullopt); - QVERIFY(Utils::take(vector, &foo) == Utils::nullopt); + QVERIFY(Utils::take(vector, ptrVector.at(0)) == std::nullopt); + QVERIFY(Utils::take(vector, &foo) == std::nullopt); QVERIFY(Utils::take(vector, nullptr).value().get() == nullptr); } } |