From a008efd24e81441a23ff3e81320ac3522251327e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 2 Jan 2016 00:35:54 +0100 Subject: GH-1365 rework java version parsing and sorting --- application/JavaCommon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/JavaCommon.cpp') diff --git a/application/JavaCommon.cpp b/application/JavaCommon.cpp index 2bec046a..403883e7 100644 --- a/application/JavaCommon.cpp +++ b/application/JavaCommon.cpp @@ -26,7 +26,7 @@ void JavaCommon::TestCheck::javaWasOk(JavaCheckResult result) { QString text; text += tr("Java test succeeded!
Platform reported: %1
Java version " - "reported: %2
").arg(result.realPlatform, result.javaVersion); + "reported: %2
").arg(result.realPlatform, result.javaVersion.toString()); if (result.errorLog.size()) { auto htmlError = result.errorLog; @@ -87,7 +87,7 @@ void JavaCommon::TestCheck::checkFinished(JavaCheckResult result) checker->m_args = m_args; checker->m_minMem = m_minMem; checker->m_maxMem = m_maxMem; - if (Strings::naturalCompare(result.javaVersion, "1.8", Qt::CaseInsensitive) < 0) + if (result.javaVersion.requiresPermGen()) { checker->m_permGen = m_permGen; } -- cgit v1.2.3