Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 08:23:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix more osx warning

Browse source
This commit is contained in:
Ryan Huffman 2016-06-21 10:51:31 -07:00
parent a77dea9048
commit 6d753e317b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -775,7 +775,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
{ "os_version", QSysInfo::productVersion() }, { "os_version", QSysInfo::productVersion() },
{ "gpu_name", gpuIdent->getName() }, { "gpu_name", gpuIdent->getName() },
{ "gpu_driver", gpuIdent->getDriver() }, { "gpu_driver", gpuIdent->getDriver() },
{ "gpu_memory", QJsonValue(static_cast<qint64>(gpuIdent->getMemory())) }, { "gpu_memory", static_cast<qint64>(gpuIdent->getMemory()) },
{ "gl_version_int", glVersionToInteger(glContextData.value("version").toString()) }, { "gl_version_int", glVersionToInteger(glContextData.value("version").toString()) },
{ "gl_version", glContextData["version"] }, { "gl_version", glContextData["version"] },
{ "gl_vender", glContextData["vendor"] }, { "gl_vender", glContextData["vendor"] },
@ -1100,9 +1100,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
QJsonObject properties = {}; QJsonObject properties = {};
MemoryInfo memInfo; MemoryInfo memInfo;
if (getMemoryInfo(memInfo)) { if (getMemoryInfo(memInfo)) {
properties["system_memory_total"] = static_cast<int64_t>(memInfo.totalMemoryBytes); properties["system_memory_total"] = static_cast<qint64>(memInfo.totalMemoryBytes);
properties["system_memory_used"] = static_cast<int64_t>(memInfo.usedMemoryBytes); properties["system_memory_used"] = static_cast<qint64>(memInfo.usedMemoryBytes);
properties["process_memory_used"] = static_cast<int64_t>(memInfo.processUsedMemoryBytes); properties["process_memory_used"] = static_cast<qint64>(memInfo.processUsedMemoryBytes);
} }
auto displayPlugin = qApp->getActiveDisplayPlugin(); auto displayPlugin = qApp->getActiveDisplayPlugin();