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:
@@ -15,7 +15,6 @@
|
||||
#include <utils/fileutils.h>
|
||||
#include <utils/fsengine/fsengine.h>
|
||||
#include <utils/hostosinfo.h>
|
||||
#include <utils/optional.h>
|
||||
#include <utils/qtcsettings.h>
|
||||
#include <utils/singleton.h>
|
||||
#include <utils/temporarydirectory.h>
|
||||
@@ -47,9 +46,10 @@
|
||||
#include <QTemporaryDir>
|
||||
#include <QTextCodec>
|
||||
|
||||
#include <iterator>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <iterator>
|
||||
|
||||
#ifdef ENABLE_QT_BREAKPAD
|
||||
#include <qtsystemexceptionhandler.h>
|
||||
@@ -295,7 +295,7 @@ struct Options
|
||||
QStringList preAppArguments;
|
||||
// list of arguments to be passed to the application or plugin manager
|
||||
std::vector<char *> appArguments;
|
||||
Utils::optional<QString> userLibraryPath;
|
||||
std::optional<QString> userLibraryPath;
|
||||
bool hasTestOption = false;
|
||||
bool wantsCleanSettings = false;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user