forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -8,11 +8,11 @@
|
||||
#include <projectexplorer/ioutputparser.h>
|
||||
#include <projectexplorer/task.h>
|
||||
|
||||
#include <utils/optional.h>
|
||||
|
||||
#include <QDir>
|
||||
#include <QRegularExpression>
|
||||
|
||||
#include <optional>
|
||||
|
||||
namespace CMakeProjectManager {
|
||||
|
||||
class CMAKE_EXPORT CMakeParser : public ProjectExplorer::OutputTaskParser
|
||||
@@ -31,7 +31,7 @@ private:
|
||||
|
||||
TripleLineError m_expectTripleLineErrorData = NONE;
|
||||
|
||||
Utils::optional<QDir> m_sourceDirectory;
|
||||
std::optional<QDir> m_sourceDirectory;
|
||||
ProjectExplorer::Task m_lastTask;
|
||||
QRegularExpression m_commonError;
|
||||
QRegularExpression m_nextSubError;
|
||||
|
||||
Reference in New Issue
Block a user