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 /src/plugins/qbsprojectmanager/qbssession.h | |
| 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 'src/plugins/qbsprojectmanager/qbssession.h')
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbssession.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qbsprojectmanager/qbssession.h b/src/plugins/qbsprojectmanager/qbssession.h index ad49d86aca..8ad9972d6d 100644 --- a/src/plugins/qbsprojectmanager/qbssession.h +++ b/src/plugins/qbsprojectmanager/qbssession.h @@ -4,7 +4,6 @@ #pragma once #include <utils/fileutils.h> -#include <utils/optional.h> #include <QHash> #include <QJsonObject> @@ -14,6 +13,7 @@ #include <QVariant> #include <functional> +#include <optional> namespace ProjectExplorer { class Target; } @@ -102,7 +102,7 @@ public: enum class State { Initializing, Active, Inactive }; enum class Error { QbsFailedToStart, QbsQuit, ProtocolError, VersionMismatch }; - Utils::optional<Error> lastError() const; + std::optional<Error> lastError() const; static QString errorString(Error error); QJsonObject projectData() const; |