aboutsummaryrefslogtreecommitdiff
path: root/launcher/java
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2023-08-14 18:16:13 +0200
committerSefa Eyeoglu <contact@scrumplex.net>2023-08-14 18:16:13 +0200
commit779f70057b021e285afd60cc650a14cd5feacffd (patch)
tree0a68d6ef065f57437441a790d6109595c47056f5 /launcher/java
parenta44cb6430eac81e6e89283c50b57142ca7f05747 (diff)
parentce2ca1381519a2e261d7f76dffa874d559d979c2 (diff)
downloadPrismLauncher-779f70057b021e285afd60cc650a14cd5feacffd.tar.gz
PrismLauncher-779f70057b021e285afd60cc650a14cd5feacffd.tar.bz2
PrismLauncher-779f70057b021e285afd60cc650a14cd5feacffd.zip
Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging
Diffstat (limited to 'launcher/java')
-rw-r--r--launcher/java/JavaVersion.cpp2
-rw-r--r--launcher/java/JavaVersion.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/java/JavaVersion.cpp b/launcher/java/JavaVersion.cpp
index 0e4fc1d3..7124e22f 100644
--- 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;
}
diff --git a/launcher/java/JavaVersion.h b/launcher/java/JavaVersion.h
index 6b92d401..d74e0148 100644
--- a/launcher/java/JavaVersion.h
+++ b/launcher/java/JavaVersion.h
@@ -25,7 +25,7 @@ public:
bool requiresPermGen();
- QString toString();
+ QString toString() const;
int major()
{