From e583158492046d7443ec6e4de713f0b669e1d43f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Tue, 1 Dec 2015 23:13:20 +0100
Subject: [PATCH] Now consistently using QT OS defines

---
 src/gui.cpp  | 12 ++++++------
 src/main.cpp |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui.cpp b/src/gui.cpp
index 621e1032..f9e55c71 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -204,10 +204,10 @@ void GUI::createMenus()
 	_fileMenu->addAction(_reloadFileAction);
 	_fileMenu->addSeparator();
 	_fileMenu->addAction(_closeFileAction);
-#ifndef __APPLE__
+#ifndef Q_OS_MAC
 	_fileMenu->addSeparator();
 	_fileMenu->addAction(_exitAction);
-#endif // __APPLE__
+#endif // Q_OS_MAC
 
 	_mapMenu = menuBar()->addMenu(tr("Map"));
 	_mapMenu->addActions(_mapActions);
@@ -237,16 +237,16 @@ void GUI::createToolBars()
 	_fileToolBar->addAction(_saveFileAction);
 	_fileToolBar->addAction(_reloadFileAction);
 	_fileToolBar->addAction(_closeFileAction);
-#ifdef __APPLE__
+#ifdef Q_OS_MAC
 	_fileToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-#endif // __APPLE__
+#endif // Q_OS_MAC
 
 	_showToolBar = addToolBar(tr("Show"));
 	_showToolBar->addAction(_showPOIAction);
 	_showToolBar->addAction(_showMapAction);
-#ifdef __APPLE__
+#ifdef Q_OS_MAC
 	_showToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-#endif // __APPLE__
+#endif // Q_OS_MAC
 }
 
 void GUI::createTrackView()
diff --git a/src/main.cpp b/src/main.cpp
index f394b20d..484e3063 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,9 +13,9 @@ int main(int argc, char *argv[])
 	QTranslator translator;
 	translator.load(QString(":/lang/gpxsee_") + locale);
 	app.installTranslator(&translator);
-#ifdef __APPLE__
+#ifdef Q_OS_MAC
 	app.setAttribute(Qt::AA_DontShowIconsInMenus);
-#endif // __APPLE__
+#endif // Q_OS_MAC
 
 	GUI gui;
 	gui.setWindowIcon(QIcon(QPixmap(APP_ICON)));