aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/hostosinfo.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2022-08-26 10:30:00 +0200
committerEike Ziller <eike.ziller@qt.io>2022-09-01 06:58:04 +0000
commit04e50438eb85c1b2be6d4dcdfd5319cdb55ae576 (patch)
tree4a3e9f078730bb538e2ca2751d189ff14a89901e /src/libs/utils/hostosinfo.cpp
parent34a9491a08639f8df0b55d74d51f4dadaa1cc2fd (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/libs/utils/hostosinfo.cpp')
-rw-r--r--src/libs/utils/hostosinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/utils/hostosinfo.cpp b/src/libs/utils/hostosinfo.cpp
index 1876ee1154e..2b424b273c2 100644
--- a/src/libs/utils/hostosinfo.cpp
+++ b/src/libs/utils/hostosinfo.cpp
@@ -94,7 +94,7 @@ bool HostOsInfo::canCreateOpenGLContext(QString *errorMessage)
#endif
}
-optional<quint64> HostOsInfo::totalMemoryInstalledInBytes()
+std::optional<quint64> HostOsInfo::totalMemoryInstalledInBytes()
{
#ifdef Q_OS_LINUX
struct sysinfo info;