From 1363b1d3649c97dbe4811f99089cf346d4aa1c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 2 Jan 2016 01:13:42 +0100
Subject: GH-1365 fix java detection OS ifdefs

---
 logic/java/JavaUtils.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'logic/java')

diff --git a/logic/java/JavaUtils.cpp b/logic/java/JavaUtils.cpp
index 9dfb7897..dcff09d3 100644
--- a/logic/java/JavaUtils.cpp
+++ b/logic/java/JavaUtils.cpp
@@ -51,7 +51,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava()
 	return javaVersion;
 }
 
-#if WINDOWS
+#if defined(Q_OS_WIN32)
 QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString keyName)
 {
 	QList<JavaInstallPtr> javas;
@@ -170,7 +170,7 @@ QList<QString> JavaUtils::FindJavaPaths()
 	return candidates;
 }
 
-#elif OSX
+#elif defined(Q_OS_MAC)
 QList<QString> JavaUtils::FindJavaPaths()
 {
 	QList<QString> javas;
@@ -193,7 +193,7 @@ QList<QString> JavaUtils::FindJavaPaths()
 	return javas;
 }
 
-#elif LINUX
+#elif defined(Q_OS_LINUX)
 QList<QString> JavaUtils::FindJavaPaths()
 {
 	qDebug() << "Linux Java detection incomplete - defaulting to \"java\"";
-- 
cgit v1.2.3