Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging

2023-08-14 18:16:13 +02:00
parent a44cb6430e ce2ca13815
commit 779f70057b
10 changed files with 22 additions and 29 deletions
--- a/launcher/java/JavaVersion.cpp
+++ b/launcher/java/JavaVersion.cpp
@ -43,7 +43,7 @@ JavaVersion::JavaVersion(const QString &rhs)
    operator=(rhs);
 }

-QString JavaVersion::toString()
+QString JavaVersion::toString() const
 {
    return m_string;
 }
--- a/launcher/java/JavaVersion.h
+++ b/launcher/java/JavaVersion.h
@ -25,7 +25,7 @@ public:

    bool requiresPermGen();

-    QString toString();
+    QString toString() const;

    int major()
    {