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:
@@ -6,12 +6,12 @@
|
||||
#include "helpviewer.h"
|
||||
#include "openpagesmanager.h"
|
||||
|
||||
#include <utils/optional.h>
|
||||
|
||||
#include <qlitehtmlwidget.h>
|
||||
|
||||
#include <QTextBrowser>
|
||||
|
||||
#include <optional>
|
||||
|
||||
namespace Help {
|
||||
namespace Internal {
|
||||
|
||||
@@ -54,7 +54,7 @@ public:
|
||||
private:
|
||||
void goForward(int count);
|
||||
void goBackward(int count);
|
||||
void setSourceInternal(const QUrl &url, Utils::optional<int> vscroll = Utils::nullopt);
|
||||
void setSourceInternal(const QUrl &url, std::optional<int> vscroll = std::nullopt);
|
||||
void showContextMenu(const QPoint &pos, const QUrl &url);
|
||||
|
||||
struct HistoryItem
|
||||
|
||||
Reference in New Issue
Block a user