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/projectexplorer/kit.cpp | |
| parent | 34a9491a08639f8df0b55d74d51f4dadaa1cc2fd (diff) | |
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/projectexplorer/kit.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/kit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index e1ccfe35d1..9ea9c6606c 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -16,7 +16,6 @@ #include <utils/filepath.h> #include <utils/icon.h> #include <utils/macroexpander.h> -#include <utils/optional.h> #include <utils/qtcassert.h> #include <utils/stringutils.h> #include <utils/utilsicons.h> @@ -26,6 +25,7 @@ #include <QUuid> #include <numeric> +#include <optional> using namespace Core; using namespace Utils; @@ -118,7 +118,7 @@ public: QHash<Id, QVariant> m_data; QSet<Id> m_sticky; QSet<Id> m_mutable; - optional<QSet<Id>> m_irrelevantAspects; + std::optional<QSet<Id>> m_irrelevantAspects; MacroExpander m_macroExpander; }; |